github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-01 16:15:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

render :json appears to have changed ... this is odd ... better add some tests

Browse Source
This commit is contained in:
Sam 2013-04-30 14:01:34 +10:00
parent 855ba562ac
commit 8a04cc05aa
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/models/site_customization.js
View File

@ -108,7 +108,7 @@ Discourse.SiteCustomization.reopenClass({
}).then(function (data) { }).then(function (data) {
if (data) { if (data) {
data.site_customizations.each(function(c) { data.site_customizations.each(function(c) {
customizations.pushObject(Discourse.SiteCustomization.create(c)); customizations.pushObject(Discourse.SiteCustomization.create(c.site_customizations));
}); });
} }
customizations.set('loading', false); customizations.set('loading', false);

8
app/assets/javascripts/admin/routes/admin_customize_route.js
View File

@ -7,11 +7,13 @@
@module Discourse @module Discourse
**/ **/
Discourse.AdminCustomizeRoute = Discourse.Route.extend({ Discourse.AdminCustomizeRoute = Discourse.Route.extend({
model: function() {
return Discourse.SiteCustomization.findAll();
},
renderTemplate: function() { renderTemplate: function() {
this.render({into: 'admin/templates/admin'}); this.render({into: 'admin/templates/admin'});
},
setupController: function(controller, model) {
// in case you are wondering, model never gets called for link_to
controller.set('content',Discourse.SiteCustomization.findAll());
} }
}); });