Skip to content

Commit 1bca81c

Browse files
authored
Merge pull request #1153 from sau226dev/sau226/history-remove-initialrev
2 parents 068fe5c + af244f8 commit 1bca81c

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

app/controllers/users_controller.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,8 @@ def activity
196196
@comments = Comment.joins(:comment_thread, :post).undeleted.where(user: @user, comment_threads: { deleted: false },
197197
posts: { deleted: false }).count
198198
@suggested_edits = SuggestedEdit.where(user: @user).count
199-
@edits = PostHistory.joins(:post).where(user: @user, posts: { deleted: false }).count
199+
@edits = PostHistory.joins(:post, :post_history_type).where(user: @user, posts: { deleted: false },
200+
post_history_types: { name: 'post_edited' }).count
200201

201202
@all_edits = @suggested_edits + @edits
202203

@@ -208,7 +209,8 @@ def activity
208209
posts: { deleted: false })
209210
when 'edits'
210211
SuggestedEdit.where(user: @user) + \
211-
PostHistory.joins(:post).where(user: @user, posts: { deleted: false })
212+
PostHistory.joins(:post).where(user: @user, posts: { deleted: false },
213+
post_history_type: PostHistoryType.find_by(name: 'post_edited'))
212214
else
213215
Post.undeleted.where(user: @user) + \
214216
Comment.joins(:comment_thread, :post).undeleted.where(user: @user, comment_threads: { deleted: false },

0 commit comments

Comments
 (0)