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

Removed modelReady hack now that the async router exists

Browse Source
This commit is contained in:
Robin Ward
2013-07-16 13:24:59 -04:00
parent 6929ee9f46
commit 4bfb546942
8 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -238,9 +238,9 @@ Discourse.AdminUser = Discourse.User.extend({
loadDetails: function() {
var model = this;
if (model.get('loadedDetails')) { return; }
if (model.get('loadedDetails')) { return Ember.RSVP.resolve(model); }
Discourse.AdminUser.find(model.get('username_lower')).then(function (result) {
return Discourse.AdminUser.find(model.get('username_lower')).then(function (result) {
model.setProperties(result);
model.set('loadedDetails', true);
});

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

@@ -11,14 +11,16 @@ var oneWeekAgo = function() {
return moment().subtract('days',7).format('YYYY-MM-DD');
};
Discourse.AdminEmailPreviewDigestRoute = Discourse.Route.extend(Discourse.ModelReady, {
Discourse.AdminEmailPreviewDigestRoute = Discourse.Route.extend({
model: function() {
return Discourse.EmailPreview.findDigest(oneWeekAgo());
},
modelReady: function(controller, model) {
afterModel: function(model) {
var controller = this.controllerFor('adminEmailPreviewDigest');
controller.setProperties({
model: model,
lastSeen: oneWeekAgo(),
showHtml: true
});

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

@@ -6,7 +6,7 @@
@namespace Discourse
@module Discourse
**/
Discourse.AdminUserRoute = Discourse.Route.extend(Discourse.ModelReady, {
Discourse.AdminUserRoute = Discourse.Route.extend({
serialize: function(params) {
return { username: Em.get(params, 'username').toLowerCase() };
@@ -20,10 +20,14 @@ Discourse.AdminUserRoute = Discourse.Route.extend(Discourse.ModelReady, {
this.render({into: 'admin/templates/admin'});
},
modelReady: function(controller, adminUser) {
adminUser.loadDetails();
controller.set('model', adminUser);
adminUser.setOriginalTrustLevel();
afterModel: function(adminUser) {
var controller = this.controllerFor('adminUser');
adminUser.loadDetails().then(function () {
adminUser.setOriginalTrustLevel();
controller.set('model', adminUser);
});
}
});