IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 20:24:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Load more user admin details, even when passed from a list

Browse Source
This commit is contained in:
Robin Ward 2013-05-14 12:03:15 -04:00
parent 674818a26a
commit df2a718446
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/admin/controllers/admin_users_list_controller.js
View File

@ -18,12 +18,12 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
@event selectAll
**/
selectAllChanged: (function() {
selectAllChanged: function() {
var _this = this;
this.get('content').each(function(user) {
user.set('selected', _this.get('selectAll'));
});
}).observes('selectAll'),
}.observes('selectAll'),
/**
Triggered when the username filter is changed
@ -39,9 +39,9 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
@event orderChanged
**/
orderChanged: (function() {
orderChanged: function() {
this.refreshUsers();
}).observes('query'),
}.observes('query'),
/**
The title of the user list, based on which query was performed.
@ -57,30 +57,30 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
@property showApproval
**/
showApproval: (function() {
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'),
}.property('query'),
/**
How many users are currently selected
@property selectedCount
**/
selectedCount: (function() {
selectedCount: function() {
if (this.blank('content')) return 0;
return this.get('content').filterProperty('selected').length;
}).property('content.@each.selected'),
}.property('content.@each.selected'),
/**
Do we have any selected users?
@property hasSelection
**/
hasSelection: (function() {
hasSelection: function() {
return this.get('selectedCount') > 0;
}).property('selectedCount'),
}.property('selectedCount'),
/**
Refresh the current list of users.

13
app/assets/javascripts/admin/routes/admin_user_route.js
View File

@ -7,15 +7,18 @@
@module Discourse
**/
Discourse.AdminUserRoute = Discourse.Route.extend({
model: function(params) {
return Discourse.AdminUser.find(params.username);
},
serialize: function(params) {
return { username: Em.get(params, 'username').toLowerCase() };
},
renderTemplate: function() {
this.render('admin/templates/user', {into: 'admin/templates/admin'});
}
},
setupController: function(controller, model) {
Discourse.AdminUser.find(Em.get(model, 'username').toLowerCase()).then(function (u) {
controller.set('content', u);
});
},
});