From 1cd14ef3aa352a8b9d832eca049fbabdefae73e8 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 21 Mar 2017 16:13:19 -0400
Subject: [PATCH] FIX: Site Settings weirdness with back button

---
 .../javascripts/admin/controllers/admin-site-settings.js.es6  | 1 -
 .../javascripts/admin/routes/admin-site-settings.js.es6       | 4 ++++
 .../javascripts/discourse/widgets/hamburger-menu.js.es6       | 2 +-
 3 files changed, 5 insertions(+), 2 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 9cd65adf101..02a907d7af9 100644
--- a/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
@@ -1,7 +1,6 @@
 import debounce from 'discourse/lib/debounce';
 
 export default Ember.Controller.extend({
-  queryParams: ["filter"],
   filter: null,
   onlyOverridden: false,
   filtered: Ember.computed.notEmpty('filter'),
diff --git a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6 b/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
index ba6e7d8761a..f5f179712b2 100644
--- a/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-site-settings.js.es6
@@ -1,6 +1,10 @@
 import SiteSetting from 'admin/models/site-setting';
 
 export default Discourse.Route.extend({
+  queryParams: {
+    filter: { replace: true }
+  },
+
   model() {
     return SiteSetting.findAll();
   },
diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
index 4bf8b257d06..7b95c363287 100644
--- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
+++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
@@ -53,7 +53,7 @@ export default createWidget('hamburger-menu', {
     }
 
     if (currentUser.admin) {
-      links.push({ route: 'adminSiteSettings',
+      links.push({ href: '/admin/site_settings/category/required',
                    icon: 'gear',
                    label: 'admin.site_settings.title',
                    className: 'settings-link' });