CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-10-04 20:13:35 +13:00
Code Issues Projects Releases Wiki Activity

Merge branch 'linked-records' of github.com:Budibase/budibase into linked-records

Browse source
This commit is contained in:
Michael Drury 2020-10-01 11:33:53 +01:00
commit 725e4e9944
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packages/builder/src/components/backend/DataTable/popovers/ColumnHeader.svelte
View file

@ -15,6 +15,7 @@
$: sortColumn = $backendUiStore.sort && $backendUiStore.sort.column $: sortColumn = $backendUiStore.sort && $backendUiStore.sort.column
$: sortDirection = $backendUiStore.sort && $backendUiStore.sort.direction $: sortDirection = $backendUiStore.sort && $backendUiStore.sort.direction
$: type = field?.type
function showEditor() { function showEditor() {
editing = true editing = true
@ -54,10 +55,12 @@
<CreateEditColumnModal onClosed={hideEditor} {field} /> <CreateEditColumnModal onClosed={hideEditor} {field} />
{:else} {:else}
<ul> <ul>
<li data-cy="edit-column-header" on:click={showEditor}> {#if type !== 'link'}
<Icon name="edit" /> <li data-cy="edit-column-header" on:click={showEditor}>
Edit <Icon name="edit" />
</li> Edit
</li>
{/if}
<li <li
data-cy="delete-column-header" data-cy="delete-column-header"
on:click={() => confirmDeleteDialog.show()}> on:click={() => confirmDeleteDialog.show()}>

5
packages/builder/src/components/backend/DataTable/popovers/CreateEditRecord.svelte
View file

@ -13,9 +13,10 @@
export let onClosed export let onClosed
let errors = [] let errors = []
$: model = record.modelId ? $backendUiStore.models.find(model => model._id === record?.modelId) : $backendUiStore.selectedModel $: model = record.modelId
? $backendUiStore.models.find(model => model._id === record?.modelId)
: $backendUiStore.selectedModel
$: modelSchema = Object.entries(model?.schema ?? {}) $: modelSchema = Object.entries(model?.schema ?? {})
$: console.log(modelSchema)
async function saveRecord() { async function saveRecord() {
const recordResponse = await api.saveRecord( const recordResponse = await api.saveRecord(

2
packages/builder/src/components/settings/Modal.svelte
View file

@ -46,7 +46,7 @@
<style> <style>
.container { .container {
padding: var(--spacing-xl); padding: 30px;
display: grid; display: grid;
grid-gap: var(--spacing-xl); grid-gap: var(--spacing-xl);
} }