MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Martin McKeaveney 2021-02-12 10:24:00 +00:00
parent ec3ef225b9 a1075881a6
commit fb7dddbefa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/server/src/utilities/security/permissions.js
View File

@ -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: {

4
packages/server/src/utilities/security/roles.js
View File

@ -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
}
/**