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

Fix silence and unsilenced response bodies

Browse Source 
Both response bodies had a typo that included suspended_at, so I renamed
it to silenced_at.
This commit is contained in:
Blake Erickson
2018-07-22 16:08:36 -06:00
parent 06323f9c89
commit 37b726982d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,7 +350,7 @@ class Admin::UsersController < Admin::AdminController
silenced: true, silenced: true,
silence_reason: silencer.user_history.try(:details), silence_reason: silencer.user_history.try(:details),
silenced_till: @user.silenced_till, silenced_till: @user.silenced_till,
suspended_at: @user.silenced_at, silenced_at: @user.silenced_at,
silenced_by: BasicUserSerializer.new(current_user, root: false).as_json silenced_by: BasicUserSerializer.new(current_user, root: false).as_json
} }
) )
@ -365,7 +365,7 @@ class Admin::UsersController < Admin::AdminController
silenced: false, silenced: false,
silence_reason: nil, silence_reason: nil,
silenced_till: nil, silenced_till: nil,
suspended_at: nil silenced_at: nil
} }
) )
end end