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 fix/more-less-than-sql

This commit is contained in:
Michael Drury 2023-09-14 14:04:57 +01:00 committed by GitHub
parent 217d10f5fb 6d74bb4063
commit 8573a8775f
4 changed files with 4 additions and 5 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.6", "version": "2.10.8",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

2
packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
View File

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

2
packages/builder/src/pages/builder/portal/users/users/[userId].svelte
View File

@ -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,

3
qa-core/src/integrations/external-schema/postgres.integration.spec.ts
View File

@ -17,8 +17,7 @@ describe("getExternalSchema", () => {
} }
beforeAll(async () => { beforeAll(async () => {
// This is left on propose without a tag, so if a new version introduces a breaking change we will be notified const container = await new GenericContainer("postgres:13.12")
const container = await new GenericContainer("postgres")
.withExposedPorts(5432) .withExposedPorts(5432)
.withEnv("POSTGRES_PASSWORD", "password") .withEnv("POSTGRES_PASSWORD", "password")
.start() .start()