From 8a04cc05aa84284f18babb3b9c46bc5c75a60cb7 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 30 Apr 2013 14:01:34 +1000
Subject: [PATCH] render :json appears to have changed ... this is odd ...
better add some tests
---
.../javascripts/admin/models/site_customization.js | 2 +-
.../admin/routes/admin_customize_route.js | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/app/assets/javascripts/admin/models/site_customization.js b/app/assets/javascripts/admin/models/site_customization.js
index dc713165574..f6af76dce33 100644
--- a/app/assets/javascripts/admin/models/site_customization.js
+++ b/app/assets/javascripts/admin/models/site_customization.js
@@ -108,7 +108,7 @@ Discourse.SiteCustomization.reopenClass({
}).then(function (data) {
if (data) {
data.site_customizations.each(function(c) {
- customizations.pushObject(Discourse.SiteCustomization.create(c));
+ customizations.pushObject(Discourse.SiteCustomization.create(c.site_customizations));
});
}
customizations.set('loading', false);
diff --git a/app/assets/javascripts/admin/routes/admin_customize_route.js b/app/assets/javascripts/admin/routes/admin_customize_route.js
index 76f5b087459..5c726ff8286 100644
--- a/app/assets/javascripts/admin/routes/admin_customize_route.js
+++ b/app/assets/javascripts/admin/routes/admin_customize_route.js
@@ -1,17 +1,19 @@
/**
Handles routes related to customization
- @class AdminCustomizeRoute
+ @class AdminCustomizeRoute
@extends Discourse.Route
@namespace Discourse
@module Discourse
-**/
+**/
Discourse.AdminCustomizeRoute = Discourse.Route.extend({
- model: function() {
- return Discourse.SiteCustomization.findAll();
+
+ renderTemplate: function() {
+ this.render({into: 'admin/templates/admin'});
},
- renderTemplate: function() {
- 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());
}
});