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

Disable new screens settings when viewing an old screen and correctly upgrade all screen settings when detaching from custom layouts

This commit is contained in:
Andrew Kingston 2022-05-16 08:48:03 +01:00
parent c8c9a05658
commit 7f4b3e4bf8
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/builder/src/builderStore/store/frontend.js
View File

@ -290,12 +290,8 @@ export const getFrontendStore = () => {
// Pull relevant settings from old layout, if required // Pull relevant settings from old layout, if required
const layout = get(store).layouts.find(x => x._id === screen.layoutId) const layout = get(store).layouts.find(x => x._id === screen.layoutId)
screen.layoutId = null screen.layoutId = null
if (screen.showNavigation == null) {
screen.showNavigation = layout?.props.navigation !== "None" screen.showNavigation = layout?.props.navigation !== "None"
}
if (screen.width == null) {
screen.width = layout?.props.width || "Large" screen.width = layout?.props.width || "Large"
}
await store.actions.screens.save(screen) await store.actions.screens.save(screen)
}, },
}, },

4
packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/ScreenSettingsPanel.svelte
View File

@ -90,7 +90,7 @@
} }
} }
const screenSettings = [ $: screenSettings = [
{ {
key: "routing.homeScreen", key: "routing.homeScreen",
control: Checkbox, control: Checkbox,
@ -134,6 +134,7 @@
control: Toggle, control: Toggle,
props: { props: {
text: "Show navigation", text: "Show navigation",
disabled: !!$selectedScreen.layoutId,
}, },
}, },
{ {
@ -143,6 +144,7 @@
props: { props: {
options: ["Extra small", "Small", "Medium", "Large", "Max"], options: ["Extra small", "Small", "Medium", "Large", "Max"],
placeholder: "Default", placeholder: "Default",
disabled: !!$selectedScreen.layoutId,
}, },
}, },
] ]