From dd9eec98ed69d89bbd0019738bc5f60517641658 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 14 Jun 2023 17:01:40 +0100 Subject: [PATCH 1/4] Update pro. --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 01fbc86700..f4b8449aac 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 01fbc8670021c5a275c2a1a36ee18b984eeafad5 +Subproject commit f4b8449aac9bd265214396afbdce7ff984a2ae34 From a9d74f759fb753b8108fb85c911e1c6a2afede38 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 15 Jun 2023 08:26:54 +0000 Subject: [PATCH 2/4] Bump version to 2.7.16-alpha.1 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index c4a6b0c2cc..7a32623867 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.16-alpha.0", + "version": "2.7.16-alpha.1", "npmClient": "yarn", "packages": [ "packages/backend-core", From 7e3b6fd07b1ceaa5a24c68c6bffc4b0e1fa65afd Mon Sep 17 00:00:00 2001 From: Conor Webb <126772285+ConorWebb96@users.noreply.github.com> Date: Thu, 15 Jun 2023 09:41:17 +0100 Subject: [PATCH 3/4] Prevent premature closure of imported users modal. (#10916) --- packages/bbui/src/Modal/Modal.svelte | 3 ++- .../builder/src/pages/builder/portal/users/users/index.svelte | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/bbui/src/Modal/Modal.svelte b/packages/bbui/src/Modal/Modal.svelte index f56ef1187f..384cfe6cac 100644 --- a/packages/bbui/src/Modal/Modal.svelte +++ b/packages/bbui/src/Modal/Modal.svelte @@ -8,6 +8,7 @@ export let fixed = false export let inline = false + export let disableCancel = false const dispatch = createEventDispatcher() let visible = fixed || inline @@ -38,7 +39,7 @@ } export function cancel() { - if (!visible) { + if (!visible || disableCancel) { return } dispatch("cancel") diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index f23d84f8bc..0aec29c2e2 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -373,7 +373,7 @@ - + Date: Thu, 15 Jun 2023 08:44:35 +0000 Subject: [PATCH 4/4] Bump version to 2.7.16-alpha.2 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 7a32623867..f1d711e915 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.7.16-alpha.1", + "version": "2.7.16-alpha.2", "npmClient": "yarn", "packages": [ "packages/backend-core",