From 25e5031fb154313c34af88a3205082d51d774be2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 29 Dec 2014 21:56:33 +0100
Subject: [PATCH] FIX: site setting search

---
 .../admin/controllers/admin-site-settings.js.es6     | 12 ++++++------
 .../routes/admin_site_settings_category_route.js     |  7 -------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
index 3c5c60883..ce0b3e360 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -28,6 +28,7 @@ export default Ember.ArrayController.extend(Discourse.Presence, {
 
     if ((filter === undefined || filter.length < 1) && !this.get('onlyOverridden')) {
       this.set('model', this.get('allSiteSettings'));
+      this.transitionToRoute("adminSiteSettings");
       return;
     }
 
@@ -50,20 +51,19 @@ export default Ember.ArrayController.extend(Discourse.Presence, {
       });
       if (matches.length > 0) {
         matchesGroupedByCategory[0].siteSettings.pushObjects(matches);
-        matchesGroupedByCategory.pushObject({
-          nameKey: settingsCategory.nameKey,
-          name: settingsCategory.name,
-          siteSettings: matches});
       }
     });
 
     this.set('model', matchesGroupedByCategory);
+    this.transitionToRoute("adminSiteSettingsCategory", "all_results");
   }, 250).observes('filter', 'onlyOverridden'),
 
   actions: {
     clearFilter: function() {
-      this.set('filter', '');
-      this.set('onlyOverridden', false);
+      this.setProperties({
+        filter: '',
+        onlyOverridden: false
+      });
     }
   }
 
diff --git a/app/assets/javascripts/admin/routes/admin_site_settings_category_route.js b/app/assets/javascripts/admin/routes/admin_site_settings_category_route.js
index 126704038..b07967e97 100644
--- a/app/assets/javascripts/admin/routes/admin_site_settings_category_route.js
+++ b/app/assets/javascripts/admin/routes/admin_site_settings_category_route.js
@@ -8,13 +8,6 @@
 **/
 Discourse.AdminSiteSettingsCategoryRoute = Discourse.Route.extend({
   model: function(params) {
-    if (params.category_id === "all_results") {
-      var category = this.controllerFor('adminSiteSettings').get('content').findProperty('nameKey', 'all_results');
-      if (!category || !category.siteSettings.length) {
-        this.replaceWith('adminSiteSettings.index');
-        return;
-      }
-    }
     // The model depends on user input, so let the controller do the work:
     this.controllerFor('adminSiteSettingsCategory').set('categoryNameKey', params.category_id);
     return Em.Object.create({