diff --git a/static/js/pandora/findElement.js b/static/js/pandora/findElement.js index ec58b97ca..4986c57f1 100644 --- a/static/js/pandora/findElement.js +++ b/static/js/pandora/findElement.js @@ -26,12 +26,14 @@ pandora.ui.findElement = function() { pandora.$ui.findSelect = Ox.Select({ id: 'select', items: Ox.merge( - pandora.site.findKeys.map(function(key, i) { - return { + Ox.map(pandora.site.findKeys, function(key, i) { + return !key.capability + || pandora.site.capabilities[key.capability][pandora.user.level] + ? { id: key.id, title: 'Find: ' + key.title, checked: findKey == key.id - }; + } : null; }), [{}, { id: 'advanced', diff --git a/static/js/pandora/siteDialog.js b/static/js/pandora/siteDialog.js index 018c2de46..af0db18b5 100644 --- a/static/js/pandora/siteDialog.js +++ b/static/js/pandora/siteDialog.js @@ -64,10 +64,10 @@ pandora.ui.siteDialog = function(section) { $dialog.options({ title: Ox.getObjectById(tabs, data.selected).title }); - pandora.URL.replace('/' + data.selected); + //pandora.URL.replace('/' + data.selected); //fixme: this should be using URL.push / UI.set //but that currenlty causes another dialog to be opened - //history.pushState({}, '', '/' + data.selected); + history.pushState({}, '', '/' + data.selected); } }); var $dialog = Ox.Dialog({