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

Merge branch 'master' into budi-7468-save-row-action-will-attempt-to-save-the-image-data-of-the

This commit is contained in:
Mel O'Hagan 2023-09-12 10:29:39 +01:00
parent fac2b845a0 948e5184c1
commit fab15e57d1
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.10.3", "version": "2.10.4",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

5
packages/frontend-core/src/constants.js
View File

@ -52,11 +52,6 @@ export const BuilderRoleDescriptions = [
icon: "User", icon: "User",
label: "App user - Only has access to published apps", label: "App user - Only has access to published apps",
}, },
{
value: BudibaseRoles.Developer,
icon: "Hammer",
label: "Developer - Access to the app builder",
},
{ {
value: BudibaseRoles.Admin, value: BudibaseRoles.Admin,
icon: "Draw", icon: "Draw",

2
packages/pro

@ -1 +1 @@
Subproject commit 4638ae916e55ce89166095578cbd01745d0ee9ee Subproject commit 961d683794442f615468d44b684e5a94633109eb

6
packages/server/src/sdk/app/permissions/index.ts
View File

@ -61,11 +61,7 @@ export async function getInheritablePermissions(
export async function allowsExplicitPermissions(resourceId: string) { export async function allowsExplicitPermissions(resourceId: string) {
if (isViewID(resourceId)) { if (isViewID(resourceId)) {
const allowed = await features.isViewPermissionEnabled() const allowed = await features.isViewPermissionEnabled()
const minPlan = !allowed const minPlan = !allowed ? PlanType.BUSINESS : undefined
? env.SELF_HOSTED
? PlanType.BUSINESS
: PlanType.PREMIUM
: undefined
return { return {
allowed, allowed,