diff --git a/ghost/admin/app/components/gh-contentfilter.js b/ghost/admin/app/components/gh-contentfilter.js index 3641c25dfa..72736c778a 100644 --- a/ghost/admin/app/components/gh-contentfilter.js +++ b/ghost/admin/app/components/gh-contentfilter.js @@ -8,7 +8,7 @@ export default class GhContentfilterComponent extends Component { @service router; get showCustomViewManagement() { - let isOwnerOrAdmin = get(this.args.currentUser || {}, 'isOwnerOrAdmin'); + let isAdmin = get(this.args.currentUser || {}, 'isAdmin'); let onPostsScreen = this.router.currentRouteName === 'posts'; let isDefaultView = this.customViews?.activeView?.isDefault; let hasFilter = this.args.selectedType.value @@ -17,7 +17,7 @@ export default class GhContentfilterComponent extends Component { || this.args.selectedTag.slug || this.args.selectedOrder.value; - return isOwnerOrAdmin && onPostsScreen && !isDefaultView && hasFilter; + return isAdmin && onPostsScreen && !isDefaultView && hasFilter; } calculateActionsDropdownPosition(trigger, content) { diff --git a/ghost/admin/app/components/gh-members-recipient-select.js b/ghost/admin/app/components/gh-members-recipient-select.js index 53b8216bd5..2a0b9f9a50 100644 --- a/ghost/admin/app/components/gh-members-recipient-select.js +++ b/ghost/admin/app/components/gh-members-recipient-select.js @@ -176,7 +176,7 @@ export default class GhMembersRecipientSelect extends Component { *fetchMemberCountsTask() { const user = yield this.session.user; - if (!user.isOwnerOrAdmin) { + if (!user.isAdmin) { return; } diff --git a/ghost/admin/app/components/gh-members-segment-count.hbs b/ghost/admin/app/components/gh-members-segment-count.hbs index 57045c0f53..fd8af31922 100644 --- a/ghost/admin/app/components/gh-members-segment-count.hbs +++ b/ghost/admin/app/components/gh-members-segment-count.hbs @@ -1,4 +1,4 @@ -{{#if this.session.user.isOwnerOrAdmin}} +{{#if this.session.user.isAdmin}} {{svg-jar "staff"}}Staff - {{#if this.session.user.isOwner}} + {{#if this.session.user.isOwnerOnly}}