IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-09-05 04:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Bugs on Admin User approval interface

Browse Source
This commit is contained in:
Robin Ward
2013-07-15 11:28:41 -04:00
parent ed60f24502
commit 08723f00c6
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/controllers/admin_users_list_controller.js
+6 -4
View File
@@ -13,6 +13,10 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
content: null,
loading: false,
queryNew: Em.computed.equal('query', 'new'),
queryPending: Em.computed.equal('query', 'pending'),
queryHasApproval: Em.computed.or('queryNew', 'queryPending'),
/**
Triggered when the selectAll property is changed
@@ -58,10 +62,8 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
@property showApproval
**/
showApproval: function() {
if (!Discourse.SiteSettings.must_approve_users) return false;
if (this.get('query') === 'new') return true;
if (this.get('query') === 'pending') return true;
}.property('query'),
return Discourse.SiteSettings.must_approve_users && this.get('queryHasApproval');
}.property('queryPending'),
/**
How many users are currently selected