diff --git a/app/controllers/admin/milestones_controller.rb b/app/controllers/admin/milestones_controller.rb index 57c0eead9..fe71b57b1 100644 --- a/app/controllers/admin/milestones_controller.rb +++ b/app/controllers/admin/milestones_controller.rb @@ -1,6 +1,6 @@ class Admin::MilestonesController < Admin::BaseController include Translatable - include ImagesHelper + include ImageAttributes before_action :load_milestoneable, only: [:index, :new, :create, :edit, :update, :destroy] before_action :load_milestone, only: [:edit, :update, :destroy] diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index 6aa70b511..dfd986fdf 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -1,6 +1,6 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController include Translatable - include ImagesHelper + include ImageAttributes load_and_authorize_resource before_action :load_search, only: [:search_booths, :search_officers] diff --git a/app/controllers/admin/widget/cards_controller.rb b/app/controllers/admin/widget/cards_controller.rb index 796e183e1..ccc05f3f2 100644 --- a/app/controllers/admin/widget/cards_controller.rb +++ b/app/controllers/admin/widget/cards_controller.rb @@ -1,6 +1,6 @@ class Admin::Widget::CardsController < Admin::BaseController include Translatable - include ImagesHelper + include ImageAttributes def new @card = ::Widget::Card.new(header: header_card?) diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb index fa908a65b..8ca9a8d71 100644 --- a/app/controllers/budgets/investments_controller.rb +++ b/app/controllers/budgets/investments_controller.rb @@ -4,7 +4,7 @@ module Budgets include FeatureFlags include CommentableActions include FlagActions - include ImagesHelper + include ImageAttributes before_action :authenticate_user!, except: [:index, :show, :json_data] diff --git a/app/controllers/concerns/image_attributes.rb b/app/controllers/concerns/image_attributes.rb new file mode 100644 index 000000000..a46128c4c --- /dev/null +++ b/app/controllers/concerns/image_attributes.rb @@ -0,0 +1,8 @@ +module ImageAttributes + extend ActiveSupport::Concern + + def image_attributes + [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] + end + +end diff --git a/app/controllers/legislation/proposals_controller.rb b/app/controllers/legislation/proposals_controller.rb index 755ffa67e..57f4818ad 100644 --- a/app/controllers/legislation/proposals_controller.rb +++ b/app/controllers/legislation/proposals_controller.rb @@ -1,7 +1,7 @@ class Legislation::ProposalsController < Legislation::BaseController include CommentableActions include FlagActions - include ImagesHelper + include ImageAttributes before_action :parse_tag_filter, only: :index before_action :load_categories, only: [:index, :new, :create, :edit, :map, :summary] diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 7d152e890..5358571de 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -2,7 +2,7 @@ class ProposalsController < ApplicationController include FeatureFlags include CommentableActions include FlagActions - include ImagesHelper + include ImageAttributes before_action :parse_tag_filter, only: :index before_action :load_categories, only: [:index, :new, :create, :edit, :map, :summary] diff --git a/app/helpers/images_helper.rb b/app/helpers/images_helper.rb index cf3cdfaab..208ccf5ab 100644 --- a/app/helpers/images_helper.rb +++ b/app/helpers/images_helper.rb @@ -76,8 +76,4 @@ module ImagesHelper "direct_upload[resource_relation]": "image") end - def image_attributes - [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy] - end - end