diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 4b64fdc2e..fad581dc6 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -22,13 +22,15 @@ class AccountController < ApplicationController end def account_params - if @account.organization? - params.require(:account).permit(:phone_number, :email_on_comment, :email_on_comment_reply, :newsletter, - organization_attributes: [:name, :responsible_name]) - else - params.require(:account).permit(:username, :public_activity, :public_interests, :email_on_comment, :email_on_comment_reply, - :email_on_direct_message, :email_digest, :newsletter, :official_position_badge) - end + attributes = if @account.organization? + [:phone_number, :email_on_comment, :email_on_comment_reply, :newsletter, + organization_attributes: [:name, :responsible_name]] + else + [:username, :public_activity, :public_interests, :email_on_comment, + :email_on_comment_reply, :email_on_direct_message, :email_digest, :newsletter, + :official_position_badge] + end + params.require(:account).permit(*attributes) end end diff --git a/app/controllers/admin/activity_controller.rb b/app/controllers/admin/activity_controller.rb index 8f7993a09..1d763c09d 100644 --- a/app/controllers/admin/activity_controller.rb +++ b/app/controllers/admin/activity_controller.rb @@ -2,7 +2,8 @@ class Admin::ActivityController < Admin::BaseController has_filters %w{all on_users on_proposals on_debates on_comments} def show - @activity = Activity.for_render.send(@current_filter).order(created_at: :desc).page(params[:page]) + @activity = Activity.for_render.send(@current_filter) + .order(created_at: :desc).page(params[:page]) end end diff --git a/app/controllers/admin/banners_controller.rb b/app/controllers/admin/banners_controller.rb index b919e0861..281fc9360 100644 --- a/app/controllers/admin/banners_controller.rb +++ b/app/controllers/admin/banners_controller.rb @@ -38,15 +38,21 @@ class Admin::BannersController < Admin::BaseController private def banner_params - params.require(:banner).permit(:title, :description, :target_url, :style, :image, :post_started_at, :post_ended_at) + attributes = [:title, :description, :target_url, :style, :image, + :post_started_at, :post_ended_at] + params.require(:banner).permit(*attributes) end def banner_styles - @banner_styles = Setting.all.banner_style.map { |banner_style| [banner_style.value, banner_style.key.split('.')[1]] } + @banner_styles = Setting.all.banner_style.map do |banner_style| + [banner_style.value, banner_style.key.split('.')[1]] + end end def banner_imgs - @banner_imgs = Setting.all.banner_img.map { |banner_img| [banner_img.value, banner_img.key.split('.')[1]] } + @banner_imgs = Setting.all.banner_img.map do |banner_img| + [banner_img.value, banner_img.key.split('.')[1]] + end end -end \ No newline at end of file +end diff --git a/app/controllers/admin/budget_investment_milestones_controller.rb b/app/controllers/admin/budget_investment_milestones_controller.rb index 73989939b..e4aebd3cf 100644 --- a/app/controllers/admin/budget_investment_milestones_controller.rb +++ b/app/controllers/admin/budget_investment_milestones_controller.rb @@ -42,10 +42,11 @@ class Admin::BudgetInvestmentMilestonesController < Admin::BaseController private def milestone_params - params.require(:budget_investment_milestone) - .permit(:title, :description, :publication_date, :budget_investment_id, - image_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], - documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]) + image_attributes = [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] + documents_attributes = [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] + attributes = [:title, :description, :publication_date, :budget_investment_id, + image_attributes: image_attributes, documents_attributes: documents_attributes] + params.require(:budget_investment_milestone).permit(*attributes) end def load_budget_investment diff --git a/app/controllers/admin/budget_phases_controller.rb b/app/controllers/admin/budget_phases_controller.rb index f63ccdb4d..8b71e5a0d 100644 --- a/app/controllers/admin/budget_phases_controller.rb +++ b/app/controllers/admin/budget_phases_controller.rb @@ -6,7 +6,8 @@ class Admin::BudgetPhasesController < Admin::BaseController def update if @phase.update(budget_phase_params) - redirect_to edit_admin_budget_path(@phase.budget), notice: t("flash.actions.save_changes.notice") + notice = t("flash.actions.save_changes.notice") + redirect_to edit_admin_budget_path(@phase.budget), notice: notice else render :edit end diff --git a/app/controllers/admin/legislation/draft_versions_controller.rb b/app/controllers/admin/legislation/draft_versions_controller.rb index 914745ba0..4e7ae18a8 100644 --- a/app/controllers/admin/legislation/draft_versions_controller.rb +++ b/app/controllers/admin/legislation/draft_versions_controller.rb @@ -9,7 +9,8 @@ class Admin::Legislation::DraftVersionsController < Admin::Legislation::BaseCont def create if @draft_version.save link = legislation_process_draft_version_path(@process, @draft_version).html_safe - redirect_to admin_legislation_process_draft_versions_path, notice: t('admin.legislation.draft_versions.create.notice', link: link) + notice = t('admin.legislation.draft_versions.create.notice', link: link) + redirect_to admin_legislation_process_draft_versions_path, notice: notice else flash.now[:error] = t('admin.legislation.draft_versions.create.error') render :new @@ -20,7 +21,8 @@ class Admin::Legislation::DraftVersionsController < Admin::Legislation::BaseCont if @draft_version.update(draft_version_params) link = legislation_process_draft_version_path(@process, @draft_version).html_safe notice = t('admin.legislation.draft_versions.update.notice', link: link) - redirect_to edit_admin_legislation_process_draft_version_path(@process, @draft_version), notice: notice + edit_path = edit_admin_legislation_process_draft_version_path(@process, @draft_version) + redirect_to edit_path, notice: notice else flash.now[:error] = t('admin.legislation.draft_versions.update.error') render :edit @@ -29,7 +31,8 @@ class Admin::Legislation::DraftVersionsController < Admin::Legislation::BaseCont def destroy @draft_version.destroy - redirect_to admin_legislation_process_draft_versions_path, notice: t('admin.legislation.draft_versions.destroy.notice') + notice = t('admin.legislation.draft_versions.destroy.notice') + redirect_to admin_legislation_process_draft_versions_path, notice: notice end private diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index 37f547883..47c7c34c0 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -10,7 +10,8 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll def create if @process.save link = legislation_process_path(@process).html_safe - redirect_to edit_admin_legislation_process_path(@process), notice: t('admin.legislation.processes.create.notice', link: link) + notice = t('admin.legislation.processes.create.notice', link: link) + redirect_to edit_admin_legislation_process_path(@process), notice: notice else flash.now[:error] = t('admin.legislation.processes.create.error') render :new @@ -31,7 +32,8 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll def destroy @process.destroy - redirect_to admin_legislation_processes_path, notice: t('admin.legislation.processes.destroy.notice') + notice = t('admin.legislation.processes.destroy.notice') + redirect_to admin_legislation_processes_path, notice: notice end private diff --git a/app/controllers/admin/legislation/questions_controller.rb b/app/controllers/admin/legislation/questions_controller.rb index 054e3e353..bac16295e 100644 --- a/app/controllers/admin/legislation/questions_controller.rb +++ b/app/controllers/admin/legislation/questions_controller.rb @@ -13,7 +13,7 @@ class Admin::Legislation::QuestionsController < Admin::Legislation::BaseControll def create @question.author = current_user if @question.save - notice = t('admin.legislation.questions.create.notice', link: legislation_process_question_path(@process, @question).html_safe) + notice = t('admin.legislation.questions.create.notice', link: question_path) redirect_to admin_legislation_process_questions_path, notice: notice else flash.now[:error] = t('admin.legislation.questions.create.error') @@ -23,7 +23,7 @@ class Admin::Legislation::QuestionsController < Admin::Legislation::BaseControll def update if @question.update(question_params) - notice = t('admin.legislation.questions.update.notice', link: legislation_process_question_path(@process, @question).html_safe) + notice = t('admin.legislation.questions.update.notice', link: question_path) redirect_to edit_admin_legislation_process_question_path(@process, @question), notice: notice else flash.now[:error] = t('admin.legislation.questions.update.error') @@ -33,11 +33,16 @@ class Admin::Legislation::QuestionsController < Admin::Legislation::BaseControll def destroy @question.destroy - redirect_to admin_legislation_process_questions_path, notice: t('admin.legislation.questions.destroy.notice') + notice = t('admin.legislation.questions.destroy.notice') + redirect_to admin_legislation_process_questions_path, notice: notice end private + def question_path + legislation_process_question_path(@process, @question).html_safe + end + def question_params params.require(:legislation_question).permit( :title, diff --git a/app/controllers/admin/poll/booth_assignments_controller.rb b/app/controllers/admin/poll/booth_assignments_controller.rb index 5b9ea9d7b..c90eb9cac 100644 --- a/app/controllers/admin/poll/booth_assignments_controller.rb +++ b/app/controllers/admin/poll/booth_assignments_controller.rb @@ -3,7 +3,8 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController before_action :load_poll, except: [:create, :destroy] def index - @booth_assignments = @poll.booth_assignments.includes(:booth).order('poll_booths.name').page(params[:page]).per(50) + @booth_assignments = @poll.booth_assignments.includes(:booth).order('poll_booths.name') + .page(params[:page]).per(50) end def search_booths @@ -15,8 +16,8 @@ class Admin::Poll::BoothAssignmentsController < Admin::Poll::BaseController end def show - @booth_assignment = @poll.booth_assignments.includes(:recounts, :voters, - officer_assignments: [officer: [:user]]).find(params[:id]) + included_relations = [:recounts, :voters, officer_assignments: [officer: [:user]]] + @booth_assignment = @poll.booth_assignments.includes(*included_relations).find(params[:id]) @voters_by_date = @booth_assignment.voters.group_by {|v| v.created_at.to_date} @partial_results = @booth_assignment.partial_results @recounts = @booth_assignment.recounts