github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-22 00:03:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Site Settings weirdness with back button

Browse Source
This commit is contained in:
Robin Ward 2017-03-21 16:13:19 -04:00
parent 874e8900af
commit 1cd14ef3aa
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/admin/controllers/admin-site-settings.js.es6
View File

@ -1,7 +1,6 @@
import debounce from 'discourse/lib/debounce'; import debounce from 'discourse/lib/debounce';
export default Ember.Controller.extend({ export default Ember.Controller.extend({
queryParams: ["filter"],
filter: null, filter: null,
onlyOverridden: false, onlyOverridden: false,
filtered: Ember.computed.notEmpty('filter'), filtered: Ember.computed.notEmpty('filter'),

4
app/assets/javascripts/admin/routes/admin-site-settings.js.es6
View File

@ -1,6 +1,10 @@
import SiteSetting from 'admin/models/site-setting'; import SiteSetting from 'admin/models/site-setting';
export default Discourse.Route.extend({ export default Discourse.Route.extend({
queryParams: {
filter: { replace: true }
},
model() { model() {
return SiteSetting.findAll(); return SiteSetting.findAll();
}, },

2
app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
View File

@ -53,7 +53,7 @@ export default createWidget('hamburger-menu', {
} }
if (currentUser.admin) { if (currentUser.admin) {
links.push({ route: 'adminSiteSettings', links.push({ href: '/admin/site_settings/category/required',
icon: 'gear', icon: 'gear',
label: 'admin.site_settings.title', label: 'admin.site_settings.title',
className: 'settings-link' }); className: 'settings-link' });