diff --git a/core/client/controllers/settings.js b/core/client/controllers/settings.js index 1b0fd9e8f7a..0b7b9a6483e 100644 --- a/core/client/controllers/settings.js +++ b/core/client/controllers/settings.js @@ -10,8 +10,8 @@ var SettingsController = Ember.Controller.extend({ showTags: Ember.computed('session.user.name', function () { return this.get('session.user.isAuthor') ? false : true; }), - showNavigation: Ember.computed('session.user.name', 'config.navigationUI', function () { - return this.get('session.user.isAuthor') || this.get('session.user.isEditor') || !this.get('config.navigationUI') ? false : true; + showNavigation: Ember.computed('session.user.name', function () { + return this.get('session.user.isAuthor') || this.get('session.user.isEditor') ? false : true; }), showCodeInjection: Ember.computed('session.user.name', 'controllers.feature.codeInjectionUI', function () { return this.get('session.user.isAuthor') || this.get('session.user.isEditor') || !this.get('controllers.feature.codeInjectionUI') ? false : true; diff --git a/core/client/routes/settings/navigation.js b/core/client/routes/settings/navigation.js index e4e66a37bd3..d2690ecb4cf 100644 --- a/core/client/routes/settings/navigation.js +++ b/core/client/routes/settings/navigation.js @@ -9,10 +9,6 @@ var NavigationRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings, classNames: ['settings-view-navigation'], beforeModel: function () { - if (!this.get('config.navigationUI')) { - return this.transitionTo('settings.general'); - } - return this.currentUser().then(this.transitionAuthor()); }, diff --git a/core/server/api/configuration.js b/core/server/api/configuration.js index 16f8230a4a3..75a203cea85 100644 --- a/core/server/api/configuration.js +++ b/core/server/api/configuration.js @@ -11,7 +11,6 @@ function getValidKeys() { var validKeys = { fileStorage: config.fileStorage === false ? false : true, apps: config.apps === true ? true : false, - navigationUI: config.navigationUI === true ? true : false, codeInjectionUI: config.codeInjectionUI === true ? true : false, version: config.ghostVersion, environment: process.env.NODE_ENV,