Skip to content

Commit 726b985

Browse files
committed
FIX: a js error when reloading /admin/site_settings/category/:id
1 parent d9e4eec commit 726b985

2 files changed

Lines changed: 4 additions & 1 deletion

File tree

app/assets/javascripts/admin/controllers/admin_site_settings_controller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Discourse.AdminSiteSettingsController = Ember.ArrayController.extend(Discourse.P
1313
/**
1414
The list of settings based on the current filters
1515
16-
@property filteredContent
16+
@property filterContent
1717
**/
1818
filterContent: function() {
1919

app/assets/javascripts/admin/routes/admin_site_settings_category_route.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@
99
Discourse.AdminSiteSettingsCategoryRoute = Discourse.Route.extend({
1010
model: function(params) {
1111
this.controllerFor('adminSiteSettingsCategory').set('categoryNameKey', params.category_id);
12+
return this.modelFor('adminSiteSettings').find(function(category) {
13+
return category.nameKey === params.category_id;
14+
});
1215
}
1316
});

0 commit comments

Comments
 (0)