diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs index 9a1325c03fe..1c80f0fd1fb 100644 --- a/app/assets/javascripts/admin/templates/user-index.hbs +++ b/app/assets/javascripts/admin/templates/user-index.hbs @@ -342,7 +342,7 @@
{{i18n 'admin.user.suspend_reason'}}: - {{model.suspend_reason}} +
{{model.full_suspend_reason}}
{{/if}} diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index f3ac6afb5c1..42cf3d86139 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -177,6 +177,10 @@ $mobile-breakpoint: 700px; } } +.full-suspend-reason { + white-space: pre-wrap; +} + .admin-users .users-list { .username .fa { color: dark-light-choose($primary-medium, $secondary-medium); diff --git a/app/models/user.rb b/app/models/user.rb index abb6313e07c..3da8bd059ab 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -684,8 +684,16 @@ class User < ActiveRecord::Base UserHistory.for(self, :suspend_user).order('id DESC').first end + def full_suspend_reason + return suspend_record.try(:details) if suspended? + end + def suspend_reason - suspend_record.try(:details) if suspended? + if details = full_suspend_reason + return details.split("\n")[0] + end + + nil end # Use this helper to determine if the user has a particular trust level. diff --git a/app/serializers/admin_detailed_user_serializer.rb b/app/serializers/admin_detailed_user_serializer.rb index e3e488415ce..8cc9316cb5d 100644 --- a/app/serializers/admin_detailed_user_serializer.rb +++ b/app/serializers/admin_detailed_user_serializer.rb @@ -16,7 +16,7 @@ class AdminDetailedUserSerializer < AdminUserSerializer :can_delete_all_posts, :can_be_deleted, :can_be_anonymized, - :suspend_reason, + :full_suspend_reason, :suspended_till, :silence_reason, :primary_group_id,