diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index c94558ab2..abcf79559 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -67,8 +67,9 @@ class DebatesController < ApplicationController end def debates_recommendations - return unless current_user.recommended_debates - @recommended_debates = Debate.recommendations(current_user).sort_by_random.limit(3) + if Setting['feature.user.recommendations_on_debates'] && current_user.recommended_debates + @recommended_debates = Debate.recommendations(current_user).sort_by_random.limit(3) + end end end diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 01e8043b1..798aeebf2 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -154,8 +154,9 @@ class ProposalsController < ApplicationController end def proposals_recommendations - return unless current_user.recommended_proposals - @recommended_proposals = Proposal.recommendations(current_user).sort_by_random.limit(3) + if Setting['feature.user.recommendations_on_proposals'] && current_user.recommended_proposals + @recommended_proposals = Proposal.recommendations(current_user).sort_by_random.limit(3) + end end end diff --git a/app/models/debate.rb b/app/models/debate.rb index e44d45420..93ca5420f 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -151,7 +151,7 @@ class Debate < ActiveRecord::Base def self.debates_orders(user) orders = %w{hot_score confidence_score created_at relevance} - orders << "recommendations" if user&.recommended_debates + orders << "recommendations" if Setting['feature.user.recommendations_on_debates'] && user&.recommended_debates return orders end end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index fa80efeed..f47584456 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -210,7 +210,7 @@ class Proposal < ActiveRecord::Base def self.proposals_orders(user) orders = %w{hot_score confidence_score created_at relevance archival_date} - orders << "recommendations" if user&.recommended_proposals + orders << "recommendations" if Setting['feature.user.recommendations_on_proposals'] && user&.recommended_proposals return orders end diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb index 41c6fc42a..967864f04 100644 --- a/app/views/debates/index.html.erb +++ b/app/views/debates/index.html.erb @@ -35,7 +35,7 @@ <%= render "shared/section_header", i18n_namespace: "debates.index.section_header", image: "debates" %> <% end %> - <% if @recommended_debates.present? %> + <% if feature?('user.recommendations') && @recommended_debates.present? %> <%= render "shared/recommended_index", recommended: @recommended_debates, disable_recommendations_path: recommendations_disable_debates_path, namespace: "debates" %> diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb index 45896130a..25c294654 100644 --- a/app/views/proposals/index.html.erb +++ b/app/views/proposals/index.html.erb @@ -37,7 +37,7 @@ <%= render "shared/section_header", i18n_namespace: "proposals.index.section_header", image: "proposals" %> <% end %> - <% if @recommended_proposals.present? %> + <% if feature?('user.recommendations') && @recommended_proposals.present? %> <%= render "shared/recommended_index", recommended: @recommended_proposals, disable_recommendations_path: recommendations_disable_proposals_path, namespace: "proposals" %>