codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't show approval on admin user page if the site doesn't require approval of users (must_approve_users)

Browse source
This commit is contained in:
Neil Lalonde 2013-09-09 12:21:47 -04:00
parent 360b8e32ca
commit 199584824b
2 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/admin/controllers/admin_user_controller.js
View file

@ -22,5 +22,9 @@ Discourse.AdminUserController = Discourse.ObjectController.extend({
});
this.toggleTitleEdit();
}
},
showApproval: function() {
return Discourse.SiteSettings.must_approve_users;
}.property()
});

48
app/assets/javascripts/admin/templates/user.js.handlebars
View file

@ -64,32 +64,34 @@
<section class='details'>
<h1>{{i18n admin.user.permissions}}</h1>
<div class='display-row'>
<div class='field'>{{i18n admin.users.approved}}</div>
<div class='value'>
{{#if approved}}
{{i18n admin.user.approved_by}}
{{#if showApproval}}
<div class='display-row'>
<div class='field'>{{i18n admin.users.approved}}</div>
<div class='value'>
{{#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}}
</div>
<div class='controls'>
{{#if approved}}
{{i18n admin.user.approve_success}}
{{else}}
{{#if can_approve}}
<button class='btn' {{action approve target="content"}}>
<i class='icon icon-ok'></i>
{{i18n admin.user.approve}}
</button>
{{#linkTo 'adminUser' approved_by}}{{avatar approved_by imageSize="small"}}{{/linkTo}}
{{#linkTo 'adminUser' approved_by}}{{approved_by.username}}{{/linkTo}}
{{else}}
{{i18n no_value}}
{{/if}}
{{/if}}
</div>
<div class='controls'>
{{#if approved}}
{{i18n admin.user.approve_success}}
{{else}}
{{#if can_approve}}
<button class='btn' {{action approve target="content"}}>
<i class='icon icon-ok'></i>
{{i18n admin.user.approve}}
</button>
{{/if}}
{{/if}}
</div>
</div>
</div>
{{/if}}
<div class='display-row'>
<div class='field'>{{i18n admin.users.active}}</div>