github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 16:34:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename "Blocked" to "Silenced"

Browse Source
This commit is contained in:
Robin Ward
2017-11-10 12:18:08 -05:00
parent ec3d800492
commit 1f14350220
51 changed files with 366 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/admin/users_controller.rb
View File

@ -15,8 +15,8 @@ class Admin::UsersController < Admin::AdminController
:approve,
:activate,
:deactivate,
:block,
:unblock,
:silence,
:unsilence,
:trust_level,
:trust_level_lock,
:add_group,
@ -272,15 +272,15 @@ class Admin::UsersController < Admin::AdminController
render body: nil
end
def block
guardian.ensure_can_block_user! @user
UserBlocker.block(@user, current_user, keep_posts: true)
def silence
guardian.ensure_can_silence_user! @user
UserSilencer.silence(@user, current_user, keep_posts: true)
render body: nil
end
def unblock
guardian.ensure_can_unblock_user! @user
UserBlocker.unblock(@user, current_user)
def unsilence
guardian.ensure_can_unsilence_user! @user
UserSilencer.unsilence(@user, current_user)
render body: nil
end