From b90a79d40a681842c79dcd3ef79377d453615796 Mon Sep 17 00:00:00 2001 From: Navin Date: Thu, 4 Jul 2013 09:32:12 +0200 Subject: [PATCH] Move setting originalTrustLevel from a CP to setupController --- app/assets/javascripts/admin/models/admin_user.js | 7 +++---- app/assets/javascripts/admin/routes/admin_user_route.js | 5 +++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/admin/models/admin_user.js b/app/assets/javascripts/admin/models/admin_user.js index a144c6c4d22..35fc578b2df 100644 --- a/app/assets/javascripts/admin/models/admin_user.js +++ b/app/assets/javascripts/admin/models/admin_user.js @@ -64,7 +64,6 @@ Discourse.AdminUser = Discourse.User.extend({ trustLevel: function() { var site = Discourse.Site.instance(); - this.set('originalValue', this.get('trust_level')); return site.get('trust_levels').findProperty('id', this.get('trust_level')); }.property('trust_level'), @@ -74,8 +73,8 @@ Discourse.AdminUser = Discourse.User.extend({ }.property('trust_level'), dirty: function() { - return this.get('originalValue') !== parseInt(this.get('trustLevel.id'), 10); - }.property('originalValue', 'trustLevel.id'), + return this.get('originalTrustLevel') !== parseInt(this.get('trustLevel.id'), 10); + }.property('originalTrustLevel', 'trustLevel.id'), saveTrustLevel: function() { Discourse.ajax("/admin/users/" + this.id + "/trust_level", { @@ -92,7 +91,7 @@ Discourse.AdminUser = Discourse.User.extend({ }, restoreTrustLevel: function() { - this.set('trustLevel.id', this.get('originalValue')); + this.set('trustLevel.id', this.get('originalTrustLevel')); }, isBanned: (function() { diff --git a/app/assets/javascripts/admin/routes/admin_user_route.js b/app/assets/javascripts/admin/routes/admin_user_route.js index ab38ba41921..736e053ea7f 100644 --- a/app/assets/javascripts/admin/routes/admin_user_route.js +++ b/app/assets/javascripts/admin/routes/admin_user_route.js @@ -16,6 +16,11 @@ Discourse.AdminUserRoute = Discourse.Route.extend(Discourse.ModelReady, { return Discourse.AdminUser.find(Em.get(params, 'username').toLowerCase()); }, + setupController: function(controller, model) { + controller.set('model', model); + controller.set('originalTrustLevel', model.trust_level); + }, + renderTemplate: function() { this.render({into: 'admin/templates/admin'}); },