diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index d5d8810ce..fc9599131 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -1,12 +1,4 @@ class Admin::SettingsController < Admin::BaseController - include Admin::ManagesProposalSettings - - helper_method :successful_proposal_setting, :successful_proposals, - :poll_feature_short_title_setting, :poll_feature_description_setting, - :poll_feature_link_setting, :email_feature_short_title_setting, - :email_feature_description_setting, - :poster_feature_short_title_setting, :poster_feature_description_setting - def index all_settings = Setting.all.group_by(&:type) @configuration_settings = all_settings["configuration"] diff --git a/app/controllers/concerns/admin/manages_proposal_settings.rb b/app/controllers/concerns/admin/manages_proposal_settings.rb deleted file mode 100644 index 9ef969fdd..000000000 --- a/app/controllers/concerns/admin/manages_proposal_settings.rb +++ /dev/null @@ -1,41 +0,0 @@ -module Admin::ManagesProposalSettings - extend ActiveSupport::Concern - - included do - def successful_proposal_setting - @successful_proposal_setting ||= Setting.find_by(key: "proposals.successful_proposal_id") - end - - def successful_proposals - Proposal.successful - end - - def poll_feature_short_title_setting - @poll_feature_short_title_setting ||= Setting.find_by(key: "proposals.poll_short_title") - end - - def poll_feature_description_setting - @poll_feature_description_setting ||= Setting.find_by(key: "proposals.poll_description") - end - - def poll_feature_link_setting - @poll_feature_link_setting ||= Setting.find_by(key: "proposals.poll_link") - end - - def email_feature_short_title_setting - @email_feature_short_title_setting ||= Setting.find_by(key: "proposals.email_short_title") - end - - def email_feature_description_setting - @email_feature_description_setting ||= Setting.find_by(key: "proposals.email_description") - end - - def poster_feature_short_title_setting - @poster_feature_short_title_setting ||= Setting.find_by(key: "proposals.poster_short_title") - end - - def poster_feature_description_setting - @poster_feature_description_setting ||= Setting.find_by(key: "proposals.poster_description") - end - end -end