diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs index a09048c7599..82fd92cf60c 100644 --- a/app/assets/javascripts/admin/templates/user-index.hbs +++ b/app/assets/javascripts/admin/templates/user-index.hbs @@ -199,8 +199,8 @@
{{#if model.approved}} {{i18n 'admin.user.approved_by'}} - {{#link-to 'adminUser' approvedBy}}{{avatar model.approvedBy imageSize="small"}}{{/link-to}} - {{#link-to 'adminUser' approvedBy}}{{model.approvedBy.username}}{{/link-to}} + {{#link-to 'adminUser' model.approvedBy}}{{avatar model.approvedBy imageSize="small"}}{{/link-to}} + {{#link-to 'adminUser' model.approvedBy}}{{model.approvedBy.username}}{{/link-to}} {{else}} {{i18n 'no_value'}} {{/if}} @@ -351,8 +351,8 @@
{{i18n 'admin.user.suspended_by'}}
- {{#link-to 'adminUser' suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}} - {{#link-to 'adminUser' suspendedBy}}{{model.suspendedBy.username}}{{/link-to}} + {{#link-to 'adminUser' model.suspendedBy}}{{avatar model.suspendedBy imageSize="tiny"}}{{/link-to}} + {{#link-to 'adminUser' model.suspendedBy}}{{model.suspendedBy.username}}{{/link-to}}
{{i18n 'admin.user.suspend_reason'}}: @@ -396,8 +396,8 @@
{{i18n 'admin.user.silenced_by'}}
- {{#link-to 'adminUser' silencedBy}}{{avatar model.silencedBy imageSize="tiny"}}{{/link-to}} - {{#link-to 'adminUser' silencedBy}}{{model.silencedBy.username}}{{/link-to}} + {{#link-to 'adminUser' model.silencedBy}}{{avatar model.silencedBy imageSize="tiny"}}{{/link-to}} + {{#link-to 'adminUser' model.silencedBy}}{{model.silencedBy.username}}{{/link-to}}
{{i18n 'admin.user.silence_reason'}}: diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index d8775cb1772..d6c1d286c54 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -308,7 +308,8 @@ class Admin::UsersController < Admin::AdminController silenced: true, silence_reason: silencer.user_history.try(:details), 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