diff --git a/app/assets/javascripts/admin/controllers/admin_user_controller.js b/app/assets/javascripts/admin/controllers/admin_user_controller.js index d23b49ab2..d2c0e83c4 100644 --- a/app/assets/javascripts/admin/controllers/admin_user_controller.js +++ b/app/assets/javascripts/admin/controllers/admin_user_controller.js @@ -22,5 +22,9 @@ Discourse.AdminUserController = Discourse.ObjectController.extend({ }); this.toggleTitleEdit(); - } + }, + + showApproval: function() { + return Discourse.SiteSettings.must_approve_users; + }.property() }); diff --git a/app/assets/javascripts/admin/templates/user.js.handlebars b/app/assets/javascripts/admin/templates/user.js.handlebars index 474c27955..08979e4f6 100644 --- a/app/assets/javascripts/admin/templates/user.js.handlebars +++ b/app/assets/javascripts/admin/templates/user.js.handlebars @@ -64,32 +64,34 @@

{{i18n admin.user.permissions}}

-
-
{{i18n admin.users.approved}}
-
- {{#if approved}} - {{i18n admin.user.approved_by}} + {{#if showApproval}} +
+
{{i18n admin.users.approved}}
+
+ {{#if approved}} + {{i18n admin.user.approved_by}} - {{#linkTo 'adminUser' approved_by}}{{avatar approved_by imageSize="small"}}{{/linkTo}} - {{#linkTo 'adminUser' approved_by}}{{approved_by.username}}{{/linkTo}} - {{else}} - {{i18n no_value}} - {{/if}} - -
-
- {{#if approved}} - {{i18n admin.user.approve_success}} - {{else}} - {{#if can_approve}} - + {{#linkTo 'adminUser' approved_by}}{{avatar approved_by imageSize="small"}}{{/linkTo}} + {{#linkTo 'adminUser' approved_by}}{{approved_by.username}}{{/linkTo}} + {{else}} + {{i18n no_value}} {{/if}} - {{/if}} + +
+
+ {{#if approved}} + {{i18n admin.user.approve_success}} + {{else}} + {{#if can_approve}} + + {{/if}} + {{/if}} +
-
+ {{/if}}
{{i18n admin.users.active}}