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

Merge branch 'develop' into backmerge-master

This commit is contained in:
Adria Navarro 2023-06-15 10:18:34 +01:00
parent f446bd96dd 60d02ed6d6
commit 37e27a881b
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -31,4 +31,4 @@
"loadEnvFiles": false "loadEnvFiles": false
} }
} }
} }

3
packages/bbui/src/Modal/Modal.svelte
View File

@ -8,6 +8,7 @@
export let fixed = false export let fixed = false
export let inline = false export let inline = false
export let disableCancel = false
const dispatch = createEventDispatcher() const dispatch = createEventDispatcher()
let visible = fixed || inline let visible = fixed || inline
@ -38,7 +39,7 @@
} }
export function cancel() { export function cancel() {
if (!visible) { if (!visible || disableCancel) {
return return
} }
dispatch("cancel") dispatch("cancel")

2
packages/builder/src/pages/builder/portal/users/users/index.svelte
View File

@ -373,7 +373,7 @@
<OnboardingTypeModal {chooseCreationType} /> <OnboardingTypeModal {chooseCreationType} />
</Modal> </Modal>
<Modal bind:this={passwordModal}> <Modal bind:this={passwordModal} disableCancel={true}>
<PasswordModal <PasswordModal
createUsersResponse={bulkSaveResponse} createUsersResponse={bulkSaveResponse}
userData={userData.users} userData={userData.users}

2
packages/pro

@ -1 +1 @@
Subproject commit 46f06fdfeb3b8f0cfdc45e09a000bd84aeacee0c Subproject commit f4b8449aac9bd265214396afbdce7ff984a2ae34