Move document attributes to concern
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
class Admin::Dashboard::ActionsController < Admin::Dashboard::BaseController
|
||||
include DocumentAttributes
|
||||
helper_method :dashboard_action, :resource
|
||||
|
||||
def index
|
||||
@@ -58,7 +59,7 @@ class Admin::Dashboard::ActionsController < Admin::Dashboard::BaseController
|
||||
.permit(
|
||||
:title, :description, :short_description, :request_to_administrators, :day_offset,
|
||||
:required_supports, :order, :active, :action_type, :published_proposal,
|
||||
documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy],
|
||||
documents_attributes: document_attributes,
|
||||
links_attributes: [:id, :label, :url, :_destroy]
|
||||
)
|
||||
end
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
class Admin::Legislation::ProcessesController < Admin::Legislation::BaseController
|
||||
include Translatable
|
||||
include ImageAttributes
|
||||
include DocumentAttributes
|
||||
|
||||
has_filters %w[active all], only: :index
|
||||
|
||||
@@ -71,7 +72,7 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll
|
||||
:font_color,
|
||||
:related_sdg_list,
|
||||
translation_params(::Legislation::Process),
|
||||
documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy],
|
||||
documents_attributes: document_attributes,
|
||||
image_attributes: image_attributes
|
||||
]
|
||||
end
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
class Admin::MilestonesController < Admin::BaseController
|
||||
include Translatable
|
||||
include ImageAttributes
|
||||
include DocumentAttributes
|
||||
|
||||
before_action :load_milestoneable, only: [:index, :new, :create, :edit, :update, :destroy]
|
||||
before_action :load_milestone, only: [:edit, :update, :destroy]
|
||||
@@ -42,10 +43,9 @@ class Admin::MilestonesController < Admin::BaseController
|
||||
private
|
||||
|
||||
def milestone_params
|
||||
documents_attributes = [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]
|
||||
attributes = [:publication_date, :status_id,
|
||||
translation_params(Milestone),
|
||||
image_attributes: image_attributes, documents_attributes: documents_attributes]
|
||||
image_attributes: image_attributes, documents_attributes: document_attributes]
|
||||
|
||||
params.require(:milestone).permit(*attributes)
|
||||
end
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController
|
||||
include Translatable
|
||||
include DocumentAttributes
|
||||
|
||||
before_action :load_answer, only: [:show, :edit, :update, :documents]
|
||||
|
||||
@@ -50,9 +51,8 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController
|
||||
private
|
||||
|
||||
def answer_params
|
||||
documents_attributes = [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]
|
||||
attributes = [:title, :description, :given_order, :question_id,
|
||||
documents_attributes: documents_attributes]
|
||||
documents_attributes: document_attributes]
|
||||
|
||||
params.require(:poll_question_answer).permit(
|
||||
*attributes, translation_params(Poll::Question::Answer)
|
||||
|
||||
@@ -5,6 +5,7 @@ module Budgets
|
||||
include FlagActions
|
||||
include RandomSeed
|
||||
include ImageAttributes
|
||||
include DocumentAttributes
|
||||
include MapLocationAttributes
|
||||
include Translatable
|
||||
include InvestmentFilters
|
||||
@@ -136,7 +137,7 @@ module Budgets
|
||||
attributes = [:heading_id, :tag_list, :organization_name, :location,
|
||||
:terms_of_service, :skip_map, :related_sdg_list,
|
||||
image_attributes: image_attributes,
|
||||
documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy],
|
||||
documents_attributes: document_attributes,
|
||||
map_location_attributes: map_location_attributes]
|
||||
params.require(:budget_investment).permit(attributes, translation_params(Budget::Investment))
|
||||
end
|
||||
|
||||
7
app/controllers/concerns/document_attributes.rb
Normal file
7
app/controllers/concerns/document_attributes.rb
Normal file
@@ -0,0 +1,7 @@
|
||||
module DocumentAttributes
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def document_attributes
|
||||
[:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]
|
||||
end
|
||||
end
|
||||
@@ -1,4 +1,5 @@
|
||||
class Dashboard::PollsController < Dashboard::BaseController
|
||||
include DocumentAttributes
|
||||
helper_method :poll
|
||||
before_action :authorize_manage_polls
|
||||
|
||||
@@ -70,11 +71,7 @@ class Dashboard::PollsController < Dashboard::BaseController
|
||||
|
||||
def question_answers_attributes
|
||||
[:id, :_destroy, :title, :description, :given_order, :question_id,
|
||||
documents_attributes: documents_attributes]
|
||||
end
|
||||
|
||||
def documents_attributes
|
||||
[:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]
|
||||
documents_attributes: document_attributes]
|
||||
end
|
||||
|
||||
def authorize_manage_polls
|
||||
|
||||
@@ -3,6 +3,7 @@ class ProposalsController < ApplicationController
|
||||
include CommentableActions
|
||||
include FlagActions
|
||||
include ImageAttributes
|
||||
include DocumentAttributes
|
||||
include MapLocationAttributes
|
||||
include Translatable
|
||||
|
||||
@@ -102,8 +103,7 @@ class ProposalsController < ApplicationController
|
||||
attributes = [:video_url, :responsible_name, :tag_list, :terms_of_service,
|
||||
:geozone_id, :skip_map, :related_sdg_list,
|
||||
image_attributes: image_attributes,
|
||||
documents_attributes: [:id, :title, :attachment, :cached_attachment,
|
||||
:user_id, :_destroy],
|
||||
documents_attributes: document_attributes,
|
||||
map_location_attributes: map_location_attributes]
|
||||
translations_attributes = translation_params(Proposal, except: :retired_explanation)
|
||||
params.require(:proposal).permit(attributes, translations_attributes)
|
||||
|
||||
Reference in New Issue
Block a user