IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-26 13:17:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Ember to RC5. Disabled a deprecation warning that I believe is in error.

Browse Source
This commit is contained in:
Robin Ward
2013-06-05 12:07:18 -04:00
parent 67ba33dee5
commit a0bd51862e
23 changed files with 7205 additions and 4791 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/routes/admin_site_content_edit_route.js
+5 -1
View File
@@ -27,7 +27,11 @@ Discourse.AdminSiteContentEditRoute = Discourse.Route.extend({
setupController: function(controller, model) {
controller.set('loaded', false);
controller.setProperties({saving: false, saved: false});
controller.setProperties({
model: model,
saving: false,
saved: false
});
Discourse.SiteContent.find(Em.get(model, 'content_type')).then(function (sc) {
controller.set('content', sc);
app/assets/javascripts/admin/routes/admin_site_contents_route.js
+2 -1
View File
@@ -12,7 +12,8 @@ Discourse.AdminSiteContentsRoute = Discourse.Route.extend({
return Discourse.SiteContentType.findAll();
},
renderTemplate: function() {
renderTemplate: function(controller, model) {
controller.set('model', model);
this.render('admin/templates/site_contents', {into: 'admin/templates/admin'});
this.render('admin/templates/site_contents_empty', {into: 'admin/templates/site_contents'});
}