Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Suspension / Silence reasons were incorrect on save

This commit is contained in:
Robin Ward 2018-01-11 10:54:27 -05:00
parent ec4295fb1c
commit e904d92b98
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,7 @@ class Admin::UsersController < Admin::AdminController
suspension: { suspension: {
suspended: true, suspended: true,
suspend_reason: params[:reason], suspend_reason: params[:reason],
full_suspend_reason: user_history.try(:details),
suspended_till: @user.suspended_till, suspended_till: @user.suspended_till,
suspended_at: @user.suspended_at suspended_at: @user.suspended_at
} }
@ -289,7 +290,7 @@ class Admin::UsersController < Admin::AdminController
render_json_dump( render_json_dump(
silence: { silence: {
silenced: true, silenced: true,
silence_reason: params[:reason], silence_reason: silencer.user_history.try(:details),
silenced_till: @user.silenced_till, silenced_till: @user.silenced_till,
suspended_at: @user.silenced_at suspended_at: @user.silenced_at
} }