diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index 3d72ed439..84f676873 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -67,16 +67,14 @@ class ActivitiesController < DataController
end
def update
- if @activity.update(activity_params)
- if activity_params[:finished].present?
- link = new_activity_path(
- name: @activity.name,
- garden_id: @activity.garden_id,
- planting_id: @activity.planting_id,
- due_date: 2.weeks.from_now.to_date
- )
- flash[:notice] = t('activities.finished_prompt_html', link: link).html_safe
- end
+ if @activity.update(activity_params) && activity_params[:finished].present?
+ link = new_activity_path(
+ name: @activity.name,
+ garden_id: @activity.garden_id,
+ planting_id: @activity.planting_id,
+ due_date: 2.weeks.from_now.to_date
+ )
+ flash[:notice] = t('activities.finished_prompt_html', link: link).html_safe
end
respond_with @activity
end
diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb
index 8e6228163..78cfc88d3 100644
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -83,11 +83,9 @@ class PlantingsController < DataController
end
def update
- if @planting.update(planting_params)
- if planting_params[:finished].present? && @planting.garden.plantings.current.empty?
- link = new_activity_path(name: 'Cultivate soil', garden_id: @planting.garden_id)
- flash[:notice] = t('plantings.finished_prompt_html', link: link).html_safe
- end
+ if @planting.update(planting_params) && planting_params[:finished].present? && @planting.garden.plantings.current.empty?
+ link = new_activity_path(name: 'Cultivate soil', garden_id: @planting.garden_id)
+ flash[:notice] = t('plantings.finished_prompt_html', link: link).html_safe
end
respond_with @planting
end
diff --git a/app/helpers/auto_suggest_helper.rb b/app/helpers/auto_suggest_helper.rb
index ff0558ef2..9cc75107d 100644
--- a/app/helpers/auto_suggest_helper.rb
+++ b/app/helpers/auto_suggest_helper.rb
@@ -13,7 +13,7 @@ module AutoSuggestHelper
resource = resource.class.name.downcase
source_path = Rails.application.routes.url_helpers.send("search_#{source}s_path", format: :json)
%(
-