consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improves notice/alert messages on poll recounting

Browse Source
This commit is contained in:
Juanjo Bazán
2017-02-18 13:23:29 +01:00
parent 4efe444cff
commit 4a195e07c4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/officing/final_recounts_controller.rb
View File

@@ -20,11 +20,11 @@ class Officing::FinalRecountsController < Officing::BaseController
@final_recount.count = final_recount_params[:count]
if @final_recount.save
notice = t("officing.final_recounts.flash.create")
msg = { notice: t("officing.final_recounts.flash.create") }
else
notice = t("officing.final_recounts.flash.error_create")
msg = { alert: t("officing.final_recounts.flash.error_create") }
end
redirect_to new_officing_poll_final_recount_path(@poll), notice: notice
redirect_to new_officing_poll_final_recount_path(@poll), msg
end
private
@@ -36,7 +36,7 @@ class Officing::FinalRecountsController < Officing::BaseController
@officer_assignment = current_user.poll_officer.
officer_assignments.final.find_by(id: final_recount_params[:officer_assignment_id])
if @officer_assignment.blank?
redirect_to new_officing_poll_final_recount_path(@poll), notice: t("officing.final_recounts.flash.error_create")
redirect_to new_officing_poll_final_recount_path(@poll), alert: t("officing.final_recounts.flash.error_create")
end
end

8
app/controllers/officing/recounts_controller.rb
View File

@@ -19,11 +19,11 @@ class Officing::RecountsController < Officing::BaseController
@recount.count = recount_params[:count]
if @recount.save
notice = t("officing.recounts.flash.create")
msg = { notice: t("officing.recounts.flash.create") }
else
notice = t("officing.recounts.flash.error_create")
msg = { alert: t("officing.recounts.flash.error_create") }
end
redirect_to new_officing_poll_recount_path(@poll), notice: notice
redirect_to new_officing_poll_recount_path(@poll), msg
end
private
@@ -35,7 +35,7 @@ class Officing::RecountsController < Officing::BaseController
@officer_assignment = current_user.poll_officer.
officer_assignments.find_by(id: recount_params[:officer_assignment_id])
if @officer_assignment.blank?
redirect_to new_officing_poll_recount_path(@poll), notice: t("officing.recounts.flash.error_create")
redirect_to new_officing_poll_recount_path(@poll), alert: t("officing.recounts.flash.error_create")
end
end