diff --git a/core/client/app/routes/settings/apps.js b/core/client/app/routes/settings/apps.js index 93aeab1d09..b3d7cbab4d 100644 --- a/core/client/app/routes/settings/apps.js +++ b/core/client/app/routes/settings/apps.js @@ -10,7 +10,9 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, { config: Ember.inject.service(), - beforeModel: function () { + beforeModel: function (transition) { + this._super(transition); + if (!this.get('config.apps')) { return this.transitionTo('settings.general'); } diff --git a/core/client/app/routes/settings/general.js b/core/client/app/routes/settings/general.js index 8d78d96151..7c563ec5fd 100644 --- a/core/client/app/routes/settings/general.js +++ b/core/client/app/routes/settings/general.js @@ -7,7 +7,8 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, { classNames: ['settings-view-general'], - beforeModel: function () { + beforeModel: function (transition) { + this._super(transition); return this.get('session.user') .then(this.transitionAuthor()) .then(this.transitionEditor()); diff --git a/core/client/app/routes/settings/labs.js b/core/client/app/routes/settings/labs.js index 8e98b670ed..f0ecc25c6f 100644 --- a/core/client/app/routes/settings/labs.js +++ b/core/client/app/routes/settings/labs.js @@ -7,7 +7,8 @@ export default AuthenticatedRoute.extend(styleBody, CurrentUserSettings, { classNames: ['settings'], - beforeModel: function () { + beforeModel: function (transition) { + this._super(transition); return this.get('session.user') .then(this.transitionAuthor()) .then(this.transitionEditor()); diff --git a/core/client/app/routes/settings/navigation.js b/core/client/app/routes/settings/navigation.js index 4ec275648c..baf6b75350 100644 --- a/core/client/app/routes/settings/navigation.js +++ b/core/client/app/routes/settings/navigation.js @@ -7,7 +7,8 @@ var NavigationRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings, classNames: ['settings-view-navigation'], - beforeModel: function () { + beforeModel: function (transition) { + this._super(transition); return this.get('session.user') .then(this.transitionAuthor()); }, diff --git a/core/client/app/routes/settings/tags.js b/core/client/app/routes/settings/tags.js index 6992b4c613..3995c4319e 100644 --- a/core/client/app/routes/settings/tags.js +++ b/core/client/app/routes/settings/tags.js @@ -14,7 +14,8 @@ paginationSettings = { TagsRoute = AuthenticatedRoute.extend(CurrentUserSettings, PaginationRouteMixin, { titleToken: 'Settings - Tags', - beforeModel: function () { + beforeModel: function (transition) { + this._super(transition); return this.get('session.user') .then(this.transitionAuthor()); }, diff --git a/core/client/app/routes/settings/users/index.js b/core/client/app/routes/settings/users/index.js index 12321b36bf..b5f2436d22 100644 --- a/core/client/app/routes/settings/users/index.js +++ b/core/client/app/routes/settings/users/index.js @@ -22,7 +22,8 @@ UsersIndexRoute = AuthenticatedRoute.extend(styleBody, CurrentUserSettings, Pagi this.setupPagination(paginationSettings); }, - beforeModel: function () { + beforeModel: function (transition) { + this._super(transition); return this.get('session.user') .then(this.transitionAuthor()); },