Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Merge pull request #4950 from ErisDS/nav-flag-remove

Browse source 
Remove navigation config flag
This commit is contained in:
Matt Enlow 2015-02-26 07:50:23 -07:00
commit ca4c4c17de
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/client/controllers/settings.js
View file

@ -10,8 +10,8 @@ var SettingsController = Ember.Controller.extend({
showTags: Ember.computed('session.user.name', function () { showTags: Ember.computed('session.user.name', function () {
return this.get('session.user.isAuthor') ? false : true; return this.get('session.user.isAuthor') ? false : true;
}), }),
showNavigation: Ember.computed('session.user.name', 'config.navigationUI', function () { showNavigation: Ember.computed('session.user.name', function () {
return this.get('session.user.isAuthor') || this.get('session.user.isEditor') || !this.get('config.navigationUI') ? false : true; return this.get('session.user.isAuthor') || this.get('session.user.isEditor') ? false : true;
}), }),
showCodeInjection: Ember.computed('session.user.name', 'controllers.feature.codeInjectionUI', function () { 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; return this.get('session.user.isAuthor') || this.get('session.user.isEditor') || !this.get('controllers.feature.codeInjectionUI') ? false : true;

4
core/client/routes/settings/navigation.js
View file

@ -9,10 +9,6 @@ var NavigationRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings,
classNames: ['settings-view-navigation'], classNames: ['settings-view-navigation'],
beforeModel: function () { beforeModel: function () {
if (!this.get('config.navigationUI')) {
return this.transitionTo('settings.general');
}
return this.currentUser().then(this.transitionAuthor()); return this.currentUser().then(this.transitionAuthor());
}, },

1
core/server/api/configuration.js
View file

@ -11,7 +11,6 @@ function getValidKeys() {
var validKeys = { var validKeys = {
fileStorage: config.fileStorage === false ? false : true, fileStorage: config.fileStorage === false ? false : true,
apps: config.apps === true ? true : false, apps: config.apps === true ? true : false,
navigationUI: config.navigationUI === true ? true : false,
codeInjectionUI: config.codeInjectionUI === true ? true : false, codeInjectionUI: config.codeInjectionUI === true ? true : false,
version: config.ghostVersion, version: config.ghostVersion,
environment: process.env.NODE_ENV, environment: process.env.NODE_ENV,