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: Silenced user wasn't being linked properly

Browse Source
This commit is contained in:
Robin Ward
2018-03-29 17:07:09 -04:00
parent e4298a91b8
commit 22b631510c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/admin/templates/user-index.hbs
View File

@ -199,8 +199,8 @@
<div class='value'> <div class='value'>
{{#if model.approved}} {{#if model.approved}}
{{i18n 'admin.user.approved_by'}} {{i18n 'admin.user.approved_by'}}
{{#link-to 'adminUser' approvedBy}}{{avatar model.approvedBy imageSize="small"}}{{/link-to}} {{#link-to 'adminUser' model.approvedBy}}{{avatar model.approvedBy imageSize="small"}}{{/link-to}}
{{#link-to 'adminUser' approvedBy}}{{model.approvedBy.username}}{{/link-to}} {{#link-to 'adminUser' model.approvedBy}}{{model.approvedBy.username}}{{/link-to}}
{{else}} {{else}}
{{i18n 'no_value'}} {{i18n 'no_value'}}
{{/if}} {{/if}}
@ -351,8 +351,8 @@
<div class='display-row highlight-danger suspension-info'> <div class='display-row highlight-danger suspension-info'>
<div class='field'>{{i18n 'admin.user.suspended_by'}}</div> <div class='field'>{{i18n 'admin.user.suspended_by'}}</div>
<div class='value'> <div class='value'>
{{#link-to 'adminUser' suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}} {{#link-to 'adminUser' model.suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}}
{{#link-to 'adminUser' suspendedBy}}{{model.suspendedBy.username}}{{/link-to}} {{#link-to 'adminUser' model.suspendedBy}}{{model.suspendedBy.username}}{{/link-to}}
</div> </div>
<div class='controls'> <div class='controls'>
<b>{{i18n 'admin.user.suspend_reason'}}</b>: <b>{{i18n 'admin.user.suspend_reason'}}</b>:
@ -396,8 +396,8 @@
<div class='display-row highlight-danger silence-info'> <div class='display-row highlight-danger silence-info'>
<div class='field'>{{i18n 'admin.user.silenced_by'}}</div> <div class='field'>{{i18n 'admin.user.silenced_by'}}</div>
<div class='value'> <div class='value'>
{{#link-to 'adminUser' silencedBy}}{{avatar model.silencedBy imageSize="tiny"}}{{/link-to}} {{#link-to 'adminUser' model.silencedBy}}{{avatar model.silencedBy imageSize="tiny"}}{{/link-to}}
{{#link-to 'adminUser' silencedBy}}{{model.silencedBy.username}}{{/link-to}} {{#link-to 'adminUser' model.silencedBy}}{{model.silencedBy.username}}{{/link-to}}
</div> </div>
<div class='controls'> <div class='controls'>
<b>{{i18n 'admin.user.silence_reason'}}</b>: <b>{{i18n 'admin.user.silence_reason'}}</b>:

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

@ -308,7 +308,8 @@ 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 suspended_at: @user.silenced_at,
silenced_by: BasicUserSerializer.new(current_user, root: false).as_json
} }
) )
end end