Added user.isOwnerOrAdmin CP

goodjobjohn · Jan 22, 2019 · 0923b1d · 0923b1d
1 parent 126be42
commit 0923b1d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/helpers/gh-user-can-admin.js b/app/helpers/gh-user-can-admin.js
@@ -6,7 +6,7 @@ import {helper} from '@ember/component/helper';
 // @param session.user
 
 export function ghUserCanAdmin(params) {
-    return !!(params[0].get('isOwner') || params[0].get('isAdmin'));
+    return !!(params[0].isOwnerOrAdmin);
 }
 
 export default helper(function (params) {

diff --git a/app/models/user.js b/app/models/user.js
@@ -52,7 +52,8 @@ export default Model.extend(ValidationEngine, {
     isAdmin: equal('role.name', 'Administrator'),
     isOwner: equal('role.name', 'Owner'),
 
-    // This is used in enough places that it's useful to throw it here
+    // These are used in enough places that it's useful to throw them here
+    isOwnerOrAdmin: or('isOwner', 'isAdmin'),
     isAuthorOrContributor: or('isAuthor', 'isContributor'),
 
     isLoggedIn: computed('id', 'session.user.id', function () {

diff --git a/app/routes/subscribers.js b/app/routes/subscribers.js
@@ -18,7 +18,7 @@ export default AuthenticatedRoute.extend({
         return RSVP.hash(promises).then((hash) => {
             let {user, subscribers} = hash;
 
-            if (!subscribers || !(user.get('isOwner') || user.get('isAdmin'))) {
+            if (!subscribers || !user.isOwnerOrAdmin) {
                 return this.transitionTo('posts');
             }
         });