diff --git a/ghost/admin/app/controllers/settings/staff/user-loading.js b/ghost/admin/app/controllers/settings/staff/user-loading.js new file mode 100644 index 0000000000..561d4686c7 --- /dev/null +++ b/ghost/admin/app/controllers/settings/staff/user-loading.js @@ -0,0 +1,10 @@ +import Controller from '@ember/controller'; +import {alias} from '@ember/object/computed'; +import {inject as service} from '@ember/service'; + +export default Controller.extend({ + session: service(), + + user: alias('model'), + currentUser: alias('session.user') +}); \ No newline at end of file diff --git a/ghost/admin/app/routes/settings/staff/index.js b/ghost/admin/app/routes/settings/staff/index.js index 84fba06ce9..20d1246f4a 100644 --- a/ghost/admin/app/routes/settings/staff/index.js +++ b/ghost/admin/app/routes/settings/staff/index.js @@ -6,6 +6,16 @@ export default class IndexRoute extends AuthenticatedRoute { @service infinity; @service session; + beforeModel() { + super.beforeModel(...arguments); + + const user = this.session.user; + + if (!user.isAdmin) { + return this.transitionTo('settings.staff.user', user); + } + } + model() { return this.session.user; } diff --git a/ghost/admin/app/templates/settings/staff/user-loading.hbs b/ghost/admin/app/templates/settings/staff/user-loading.hbs index 9167696e79..33bd3846ea 100644 --- a/ghost/admin/app/templates/settings/staff/user-loading.hbs +++ b/ghost/admin/app/templates/settings/staff/user-loading.hbs @@ -1,12 +1,17 @@
-

- Settings - {{svg-jar "arrow-right"}} - Staff - {{svg-jar "arrow-right"}} - {{this.user.name}} -

+ {{!-- Remove breadcrumbs for Authors and Contributors --}} + {{#if this.currentUser.isAuthorOrContributor}} +

Your profile

+ {{else}} +

+ Settings + {{svg-jar "arrow-right"}} + Staff + {{svg-jar "arrow-right"}} + {{this.user.name}} +

+ {{/if}}
Save