mirror of
https://github.com/discourse/discourse.git
synced 2025-02-16 18:24:52 -06:00
FIX: show all deleted posts
This commit is contained in:
parent
5f3176dfd4
commit
6cd4330335
@ -45,7 +45,7 @@ Discourse.UserPostsStream = Discourse.Model.extend({
|
||||
self.setProperties({
|
||||
loaded: true,
|
||||
itemsLoaded: self.get("itemsLoaded") + posts.length,
|
||||
canLoadMore: posts.length === 0 || posts.length < 60
|
||||
canLoadMore: posts.length > 0
|
||||
});
|
||||
}
|
||||
}).finally(function () {
|
||||
|
@ -351,10 +351,7 @@ class PostsController < ApplicationController
|
||||
offset = [params[:offset].to_i, 0].max
|
||||
limit = [(params[:limit] || 60).to_i, 100].min
|
||||
|
||||
posts = user_posts(user.id, offset, limit)
|
||||
.where(user_deleted: false)
|
||||
.where.not(deleted_by_id: user.id)
|
||||
.where.not(deleted_at: nil)
|
||||
posts = user_posts(user.id, offset, limit).where.not(deleted_at: nil)
|
||||
|
||||
render_serialized(posts, AdminPostSerializer)
|
||||
end
|
||||
|
@ -681,8 +681,6 @@ class User < ActiveRecord::Base
|
||||
def number_of_deleted_posts
|
||||
Post.with_deleted
|
||||
.where(user_id: self.id)
|
||||
.where(user_deleted: false)
|
||||
.where.not(deleted_by_id: self.id)
|
||||
.where.not(deleted_at: nil)
|
||||
.count
|
||||
end
|
||||
|
@ -1156,4 +1156,28 @@ describe User do
|
||||
|
||||
end
|
||||
|
||||
describe "number_of_deleted_posts" do
|
||||
|
||||
let(:user) { Fabricate(:user, id: 2) }
|
||||
let(:moderator) { Fabricate(:moderator) }
|
||||
|
||||
it "counts all the posts" do
|
||||
# at least 1 "unchanged" post
|
||||
Fabricate(:post, user: user)
|
||||
|
||||
post_deleted_by_moderator = Fabricate(:post, user: user)
|
||||
PostDestroyer.new(moderator, post_deleted_by_moderator).destroy
|
||||
|
||||
post_deleted_by_user = Fabricate(:post, user: user, post_number: 2)
|
||||
PostDestroyer.new(user, post_deleted_by_user).destroy
|
||||
|
||||
# fake stub deletion
|
||||
post_deleted_by_user.update_columns(updated_at: 2.days.ago)
|
||||
PostDestroyer.destroy_stubs
|
||||
|
||||
expect(user.number_of_deleted_posts).to eq(2)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user