diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 13f21ba3fcb3baccab376421e2538e437442c9fd..1e3db9c72286648fef0b71508bac11d4e170965e 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -196,7 +196,8 @@ class UsersController < ApplicationController @comments = Comment.joins(:comment_thread, :post).undeleted.where(user: @user, comment_threads: { deleted: false }, posts: { deleted: false }).count @suggested_edits = SuggestedEdit.where(user: @user).count - @edits = PostHistory.joins(:post).where(user: @user, posts: { deleted: false }).count + @edits = PostHistory.joins(:post, :post_history_type).where(user: @user, posts: { deleted: false }, + post_history_types: { name: 'post_edited' }).count @all_edits = @suggested_edits + @edits @@ -208,7 +209,8 @@ class UsersController < ApplicationController posts: { deleted: false }) when 'edits' SuggestedEdit.where(user: @user) + \ - PostHistory.joins(:post).where(user: @user, posts: { deleted: false }) + PostHistory.joins(:post).where(user: @user, posts: { deleted: false }, + post_history_type: PostHistoryType.find_by(name: 'post_edited')) else Post.undeleted.where(user: @user) + \ Comment.joins(:comment_thread, :post).undeleted.where(user: @user, comment_threads: { deleted: false },