Merge branch 'rbac-ui' of https://github.com/Budibase/budibase into rbac-ui

5 years ago · 2c8696b8f0
2 changed files with 4 additions and 2 deletions
--- a/packages/server/src/utilities/security/permissions.js
+++ b/packages/server/src/utilities/security/permissions.js
@ -75,7 +75,7 @@ exports.BUILTIN_PERMISSIONS = {
    _id: exports.BUILTIN_PERMISSION_IDS.PUBLIC,
    name: "Public",
    permissions: [
-      new Permission(PermissionTypes.WEBHOOK, PermissionLevels.EXECUTE)
+      new Permission(PermissionTypes.WEBHOOK, PermissionLevels.EXECUTE),
    ],
  },
  READ_ONLY: {
--- a/packages/server/src/utilities/security/roles.js
+++ b/packages/server/src/utilities/security/roles.js
@ -86,7 +86,9 @@ exports.lowerBuiltinRoleID = (roleId1, roleId2) => {
  if (!roleId2) {
    return roleId1
  }
-  return builtinRoleToNumber(roleId1) > builtinRoleToNumber(roleId2) ? roleId2 : roleId1
+  return builtinRoleToNumber(roleId1) > builtinRoleToNumber(roleId2)
+    ? roleId2
+    : roleId1
 }

 /**