Merge branch 'master' of github.com:Budibase/budibase into fix/ci-disk-space
This commit is contained in:
commit
8dec06857c
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "2.10.7-alpha.0",
|
"version": "2.10.7",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"packages": [
|
"packages": [
|
||||||
"packages/*"
|
"packages/*"
|
||||||
|
|
|
@ -126,7 +126,7 @@
|
||||||
user,
|
user,
|
||||||
prodAppId
|
prodAppId
|
||||||
)
|
)
|
||||||
const isAppBuilder = sdk.users.hasAppBuilderPermissions(user, prodAppId)
|
const isAppBuilder = user.builder?.apps?.includes(prodAppId)
|
||||||
let role
|
let role
|
||||||
if (isAdminOrGlobalBuilder) {
|
if (isAdminOrGlobalBuilder) {
|
||||||
role = Constants.Roles.ADMIN
|
role = Constants.Roles.ADMIN
|
||||||
|
|
|
@ -111,7 +111,7 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
return availableApps.map(app => {
|
return availableApps.map(app => {
|
||||||
const prodAppId = apps.getProdAppID(app.appId)
|
const prodAppId = apps.getProdAppID(app.devId)
|
||||||
return {
|
return {
|
||||||
name: app.name,
|
name: app.name,
|
||||||
devId: app.devId,
|
devId: app.devId,
|
||||||
|
|
Loading…
Reference in New Issue