diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb index 1f3d8e837..ef815470d 100644 --- a/app/controllers/admin/comments_controller.rb +++ b/app/controllers/admin/comments_controller.rb @@ -4,7 +4,8 @@ class Admin::CommentsController < Admin::BaseController before_action :load_comment, only: [:confirm_hide, :restore] def index - @comments = Comment.only_hidden.with_visible_author.send(@current_filter).order(hidden_at: :desc).page(params[:page]) + @comments = Comment.not_valuations.only_hidden.with_visible_author + .send(@current_filter).order(hidden_at: :desc).page(params[:page]) end def confirm_hide @@ -22,7 +23,7 @@ class Admin::CommentsController < Admin::BaseController private def load_comment - @comment = Comment.with_hidden.find(params[:id]) + @comment = Comment.not_valuations.with_hidden.find(params[:id]) end -end \ No newline at end of file +end diff --git a/app/controllers/admin/stats_controller.rb b/app/controllers/admin/stats_controller.rb index 91e266b77..543f24a61 100644 --- a/app/controllers/admin/stats_controller.rb +++ b/app/controllers/admin/stats_controller.rb @@ -6,7 +6,7 @@ class Admin::StatsController < Admin::BaseController @visits = Visit.count @debates = Debate.with_hidden.count @proposals = Proposal.with_hidden.count - @comments = Comment.with_hidden.count + @comments = Comment.not_valuations.with_hidden.count @debate_votes = Vote.where(votable_type: 'Debate').count @proposal_votes = Vote.where(votable_type: 'Proposal').count diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index cd2efac6b..7130e661d 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -9,7 +9,7 @@ class StatsController < ApplicationController @visits = daily_cache('visits') { Visit.count } @debates = daily_cache('debates') { Debate.with_hidden.count } @proposals = daily_cache('proposals') { Proposal.with_hidden.count } - @comments = daily_cache('comments') { Comment.with_hidden.count } + @comments = daily_cache('comments') { Comment.not_valuations.with_hidden.count } @debate_votes = daily_cache('debate_votes') { Vote.where(votable_type: 'Debate').count } @proposal_votes = daily_cache('proposal_votes') { Vote.where(votable_type: 'Proposal').count } diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6d47f2419..6649c5283 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -88,7 +88,7 @@ class UsersController < ApplicationController end def all_user_comments - Comment.not_as_admin_or_moderator.where(user_id: @user.id) + Comment.not_valuations.not_as_admin_or_moderator.where(user_id: @user.id) end def only_active_commentables diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb index 14615379e..37970f594 100644 --- a/spec/features/users_spec.rb +++ b/spec/features/users_spec.rb @@ -368,6 +368,17 @@ feature 'Users' do expect(page).not_to have_content(admin_comment.body) end + scenario 'valuation comments are not visible in user activity' do + admin = create(:administrator).user + comment = create(:comment, user: admin) + investment = create(:budget_investment) + valuation_comment = create(:comment, :valuation, user: admin, commentable: investment) + + visit user_path(admin) + expect(page).to have_content(comment.body) + expect(page).not_to have_content(valuation_comment.body) + end + scenario 'shows only comments from active features' do user = create(:user) 1.times {create(:comment, user: user, commentable: create(:debate))}