From ab9d612128d32e35ce9129cef84bf2306f244178 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Thu, 21 Sep 2017 10:11:00 -0400 Subject: [PATCH] 'Proposals' feature can be enabled/disabled Fixes #1886 --- app/controllers/admin/proposals_controller.rb | 6 +++++- app/controllers/moderation/proposals_controller.rb | 3 +++ app/controllers/proposals_controller.rb | 3 +++ app/views/admin/_menu.html.erb | 8 +++++--- app/views/moderation/_menu.html.erb | 14 ++++++++------ app/views/pages/more_info/_menu.html.erb | 8 +++++--- app/views/pages/more_info/index.html.erb | 4 +++- app/views/shared/_subnavigation.html.erb | 8 +++++--- app/views/users/_activity_page.html.erb | 2 +- config/locales/en/settings.yml | 1 + config/locales/es/settings.yml | 1 + config/locales/fr/settings.yml | 1 + config/locales/nl/settings.yml | 1 + db/dev_seeds.rb | 1 + db/seeds.rb | 1 + spec/features/admin/proposals_spec.rb | 10 ++++++++++ spec/features/moderation/proposals_spec.rb | 10 ++++++++++ spec/features/proposals_spec.rb | 6 ++++++ 18 files changed, 70 insertions(+), 18 deletions(-) diff --git a/app/controllers/admin/proposals_controller.rb b/app/controllers/admin/proposals_controller.rb index 2a6dfd718..02cf44aaf 100644 --- a/app/controllers/admin/proposals_controller.rb +++ b/app/controllers/admin/proposals_controller.rb @@ -1,6 +1,10 @@ class Admin::ProposalsController < Admin::BaseController + include FeatureFlags + has_filters %w{without_confirmed_hide all with_confirmed_hide}, only: :index + feature_flag :proposals + before_action :load_proposal, only: [:confirm_hide, :restore] def index @@ -25,4 +29,4 @@ class Admin::ProposalsController < Admin::BaseController @proposal = Proposal.with_hidden.find(params[:id]) end -end \ No newline at end of file +end diff --git a/app/controllers/moderation/proposals_controller.rb b/app/controllers/moderation/proposals_controller.rb index 4883bd378..f15aca85d 100644 --- a/app/controllers/moderation/proposals_controller.rb +++ b/app/controllers/moderation/proposals_controller.rb @@ -1,9 +1,12 @@ class Moderation::ProposalsController < Moderation::BaseController include ModerateActions + include FeatureFlags has_filters %w{pending_flag_review all with_ignored_flag}, only: :index has_orders %w{flags created_at}, only: :index + feature_flag :proposals + before_action :load_resources, only: [:index, :moderate] load_and_authorize_resource diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index e86caf922..bfd8baeb0 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -1,4 +1,5 @@ class ProposalsController < ApplicationController + include FeatureFlags include CommentableActions include FlagActions @@ -7,6 +8,8 @@ class ProposalsController < ApplicationController before_action :load_geozones, only: [:edit, :map, :summary] before_action :authenticate_user!, except: [:index, :show, :map, :summary] + feature_flag :proposals + invisible_captcha only: [:create, :update], honeypot: :subtitle has_orders ->(c) { Proposal.proposals_orders(c.current_user) }, only: :index diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb index bae999fe4..41500e376 100644 --- a/app/views/admin/_menu.html.erb +++ b/app/views/admin/_menu.html.erb @@ -19,9 +19,11 @@ <%= t("admin.menu.title_moderated_content") %>