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

Merge pull request #1631 from Budibase/fix/relationship-editting-ui 

Some quick fixes for relationship UI
This commit is contained in:
Michael Drury 2021-06-04 21:46:46 +01:00 committed by GitHub
parent 4bb24f7e9a a58cd69133
commit 3216948e1e
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
View File

@ -43,6 +43,7 @@
} }
let originalName = field.name let originalName = field.name
const linkEditDisabled = originalName != null
let primaryDisplay = let primaryDisplay =
$tables.selected.primaryDisplay == null || $tables.selected.primaryDisplay == null ||
$tables.selected.primaryDisplay === field.name $tables.selected.primaryDisplay === field.name
@ -197,7 +198,7 @@
<Input <Input
label="Name" label="Name"
bind:value={field.name} bind:value={field.name}
disabled={uneditable || field.type === LINK_TYPE} disabled={uneditable || (linkEditDisabled && field.type === LINK_TYPE)}
/> />
<Select <Select
@ -284,6 +285,7 @@
{:else if field.type === "link"} {:else if field.type === "link"}
<Select <Select
label="Table" label="Table"
disabled={linkEditDisabled}
bind:value={field.tableId} bind:value={field.tableId}
options={tableOptions} options={tableOptions}
getOptionLabel={table => table.name} getOptionLabel={table => table.name}
@ -291,7 +293,7 @@
/> />
{#if relationshipOptions && relationshipOptions.length > 0} {#if relationshipOptions && relationshipOptions.length > 0}
<RadioGroup <RadioGroup
disabled={originalName != null} disabled={linkEditDisabled}
label="Define the relationship" label="Define the relationship"
bind:value={field.relationshipType} bind:value={field.relationshipType}
options={relationshipOptions} options={relationshipOptions}
@ -299,7 +301,11 @@
getOptionValue={option => option.value} getOptionValue={option => option.value}
/> />
{/if} {/if}
<Input label={`Column name in other table`} bind:value={field.fieldName} /> <Input
disabled={linkEditDisabled}
label={`Column name in other table`}
bind:value={field.fieldName}
/>
{:else if field.type === FORMULA_TYPE} {:else if field.type === FORMULA_TYPE}
<ModalBindableInput <ModalBindableInput
title="Handlebars Formula" title="Handlebars Formula"

8
packages/server/src/api/controllers/application.js
View File

@ -99,12 +99,18 @@ async function createInstance(template) {
// replicate the template data to the instance DB // replicate the template data to the instance DB
// this is currently very hard to test, downloading and importing template files // this is currently very hard to test, downloading and importing template files
/* istanbul ignore next */ /* istanbul ignore next */
let _rev
if (template && template.useTemplate === "true") { if (template && template.useTemplate === "true") {
const { ok } = await db.load(await getTemplateStream(template)) const { ok } = await db.load(await getTemplateStream(template))
if (!ok) { if (!ok) {
throw "Error loading database dump from template." throw "Error loading database dump from template."
} }
var { _rev } = await db.get(DocumentTypes.APP_METADATA) try {
const response = await db.get(DocumentTypes.APP_METADATA)
_rev = response._rev
} catch (err) {
_rev = null
}
} else { } else {
// create the users table // create the users table
await db.put(USERS_TABLE_SCHEMA) await db.put(USERS_TABLE_SCHEMA)