Merge pull request #377 from outgrow/outgrow-fix-blank-screen-product…

…-creation fix: blank screen on production creation
reactioncommerce · Jul 11, 2021 · bad1ef0 · bad1ef0
2 parents 6637d32 + e143506
commit bad1ef0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/modules/core/main.js b/client/modules/core/main.js
@@ -174,7 +174,7 @@ export default {
       permissions = _.uniq(permissions);
 
       // if accountPermissions includes any of permissions, then we return true
-      return accountPermissions[permissionsGroup].some((permission) => permissions.includes(permission));
+      return accountPermissions[permissionsGroup] && accountPermissions[permissionsGroup].some((permission) => permissions.includes(permission));
     }
 
     /**

diff --git a/imports/plugins/core/core/server/Reaction/core.js b/imports/plugins/core/core/server/Reaction/core.js
@@ -118,7 +118,7 @@ export default {
     }
 
     // if accountPermissions includes any of checkPermissions, then we return true
-    return accountPermissions[group].some((permission) => checkPermissions.includes(permission));
+    return accountPermissions[group] && accountPermissions[group].some((permission) => checkPermissions.includes(permission));
   },
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -118,7 +118,7 @@ export default { @@
         }
         // if accountPermissions includes any of checkPermissions, then we return true
-        return accountPermissions[group].some((permission) => checkPermissions.includes(permission));
+        return accountPermissions[group] && accountPermissions[group].some((permission) => checkPermissions.includes(permission));
       },
       /**
@@ Expand Down @@