don't hide all a user's posts when staff manually blocks them

This commit is contained in:
Neil Lalonde 2016-01-14 15:20:26 -05:00
parent b8299a2710
commit 1aa68e085e
2 changed files with 2 additions and 2 deletions

View File

@ -216,7 +216,7 @@ class Admin::UsersController < Admin::AdminController
def block
guardian.ensure_can_block_user! @user
UserBlocker.block(@user, current_user)
UserBlocker.block(@user, current_user, keep_posts: true)
render nothing: true
end

View File

@ -13,7 +13,7 @@ class UserBlocker
end
def block
hide_posts
hide_posts unless @opts[:keep_posts]
unless @user.blocked?
@user.blocked = true
if @user.save