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

Merge pull request #288 from Budibase/model-fixes 

model bugfixes
This commit is contained in:
Martin McKeaveney 2020-06-02 11:46:38 +01:00 committed by GitHub
parent b977cbd9aa 527a25c794
commit 89e41edac7
8 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@ export const getBackendUiStore = () => {
state.selectedDatabase = db state.selectedDatabase = db
if (models && models.length > 0) { if (models && models.length > 0) {
state.selectedModel = models[0] state.selectedModel = models[0]
state.selectedView = `${models[0]._id}` state.selectedView = `all_${models[0]._id}`
} }
state.breadcrumbs = [db.name] state.breadcrumbs = [db.name]
state.models = models state.models = models
@ -76,7 +76,7 @@ export const getBackendUiStore = () => {
state.models.push(model) state.models.push(model)
state.models = state.models state.models = state.models
state.selectedModel = model state.selectedModel = model
state.selectedView = `${model._id}` state.selectedView = `all_${model._id}`
return state return state
}), }),
}, },

2
packages/builder/src/components/common/Switcher.svelte
View File

@ -69,7 +69,7 @@
.switcher > .selected { .switcher > .selected {
color: var(--ink); color: var(--ink);
} }
.panel { .panel {
min-height: 0; min-height: 0;
height: 100%; height: 100%;

2
packages/builder/src/components/nav/SchemaManagementDrawer.svelte
View File

@ -46,7 +46,7 @@
function selectModel(model) { function selectModel(model) {
backendUiStore.update(state => { backendUiStore.update(state => {
state.selectedModel = model state.selectedModel = model
state.selectedView = `${model._id}` state.selectedView = `all_${model._id}`
return state return state
}) })
} }

2
packages/builder/src/components/userInterface/ComponentDropdownMenu.svelte
View File

@ -145,7 +145,7 @@
regenerateCssForCurrentScreen(s) regenerateCssForCurrentScreen(s)
saveCurrentPreviewItem(s) saveCurrentPreviewItem(s)
selectComponent(s, componentToPaste) selectComponent(s, componentToPaste)
return s return s
}) })
} }

2
packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
View File

@ -108,7 +108,7 @@
flex-direction: column; flex-direction: column;
/* Merge Check */ /* Merge Check */
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
padding: 20px; padding: 20px;
box-sizing: border-box; box-sizing: border-box;
/* Merge Check */ /* Merge Check */

8
packages/builder/src/components/workflow/SetupPanel/SetupPanel.svelte
View File

@ -12,13 +12,13 @@
const ACCESS_LEVELS = [ const ACCESS_LEVELS = [
{ {
name: "Admin", name: "Admin",
key: "ADMIN" key: "ADMIN",
}, },
{ {
name: "Power User", name: "Power User",
key: "POWER_USER" key: "POWER_USER",
} },
]; ]
let selectedTab = "SETUP" let selectedTab = "SETUP"
let testResult let testResult

4
packages/builder/src/pages/[application]/backend/database/[selectedDatabase]/index.svelte
View File

@ -43,7 +43,9 @@
{#if $backendUiStore.selectedDatabase._id && $backendUiStore.selectedModel.name} {#if $backendUiStore.selectedDatabase._id && $backendUiStore.selectedModel.name}
<ModelDataTable {selectRecord} /> <ModelDataTable {selectRecord} />
{:else} {:else}
<i style="color: var(--grey-dark)">create your first model to start building</i> <i style="color: var(--grey-dark)">
create your first model to start building
</i>
{/if} {/if}
<style> <style>

2
packages/server/src/api/routes/view.js
View File

@ -8,7 +8,7 @@ const router = Router()
router router
.get( .get(
"/api/:instanceId/view/:viewName", "/api/:instanceId/views/:viewName",
authorized(READ_VIEW, ctx => ctx.params.viewName), authorized(READ_VIEW, ctx => ctx.params.viewName),
recordController.fetchView recordController.fetchView
) )