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

Merge branch 'master' of github.com:Budibase/budibase into fix/correcting-multi-relationships

This commit is contained in:
mike12345567 2024-07-09 13:38:07 +01:00
parent c0b85c6379 d1f0454831
commit 8c15dcbf61
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/builder/src/stores/builder/automations.js
View File

@ -146,13 +146,13 @@ const automationActions = store => ({
await store.actions.save(automation) await store.actions.save(automation)
notifications.success( notifications.success(
`Automation ${ `Automation ${
automation.disabled ? "enabled" : "disabled" automation.disabled ? "disabled" : "enabled"
} successfully` } successfully`
) )
} catch (error) { } catch (error) {
notifications.error( notifications.error(
`Error ${ `Error ${
automation && automation.disabled ? "enabling" : "disabling" automation && automation.disabled ? "disabling" : "enabling"
} automation` } automation`
) )
} }

2
packages/client/src/components/app/Modal.svelte
View File

@ -56,7 +56,7 @@
<Modal <Modal
on:cancel={handleModalClose} on:cancel={handleModalClose}
bind:this={modal} bind:this={modal}
disableCancel={$builderStore.inBuilder} disableCancel={$builderStore.inBuilder || ignoreClicksOutside}
zIndex={2} zIndex={2}
> >
<div use:styleable={$component.styles} class={`modal-content ${size}`}> <div use:styleable={$component.styles} class={`modal-content ${size}`}>