IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Discourse Macro Helpers + Minor Fix to Admin User View

Browse Source
This commit is contained in:
Robin Ward
2013-07-11 19:35:52 -04:00
parent 89152116c6
commit 5eaae063f0
13 changed files with 136 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,9 +78,7 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
@property hasSelection
**/
hasSelection: function() {
return this.get('selectedCount') > 0;
}.property('selectedCount'),
hasSelection: Em.computed.gt('selectedCount', 0),
/**
Refresh the current list of users.

13
app/assets/javascripts/admin/models/admin_user.js
View File

@@ -98,19 +98,14 @@ Discourse.AdminUser = Discourse.User.extend({
this.set('trustLevel.id', this.get('originalTrustLevel'));
},
isBanned: (function() {
return this.get('is_banned') === true;
}).property('is_banned'),
isBanned: Em.computed.equal('is_banned', true),
canBan: Em.computed.not('staff'),
canBan: (function() {
return !this.get('admin') && !this.get('moderator');
}).property('admin', 'moderator'),
banDuration: (function() {
banDuration: function() {
var banned_at = moment(this.banned_at);
var banned_till = moment(this.banned_till);
return banned_at.format('L') + " - " + banned_till.format('L');
}).property('banned_till', 'banned_at'),
}.property('banned_till', 'banned_at'),
ban: function() {
var duration = parseInt(window.prompt(I18n.t('admin.user.ban_duration')), 10);

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

@@ -16,11 +16,6 @@ Discourse.AdminUserRoute = Discourse.Route.extend(Discourse.ModelReady, {
return Discourse.AdminUser.find(Em.get(params, 'username').toLowerCase());
},
setupController: function(controller, model) {
controller.set('model', model);
model.setOriginalTrustLevel();
},
renderTemplate: function() {
this.render({into: 'admin/templates/admin'});
},
@@ -28,6 +23,7 @@ Discourse.AdminUserRoute = Discourse.Route.extend(Discourse.ModelReady, {
modelReady: function(controller, adminUser) {
adminUser.loadDetails();
controller.set('model', adminUser);
adminUser.setOriginalTrustLevel();
}
});