Browse Source

Merge branch 'form-builder' into relationship-one-to-many

pull/1122/head
Keviin Åberg Kultalahti 6 years ago
parent
commit
cd14b7b4e4
  1. 2
      hosting/docker-compose.yaml
  2. 7
      packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte
  3. 2
      packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte

2
hosting/docker-compose.yaml

@ -84,7 +84,7 @@ services:
#- "4369:4369"
#- "9100:9100"
volumes:
- couchdb_data:/couchdb
- couchdb_data:/opt/couchdb/data
couch-init:
image: curlimages/curl

7
packages/builder/src/components/design/NavigationPanel/ComponentDropdownMenu.svelte

@ -13,9 +13,8 @@
let dropdown
let anchor
$: noChildrenAllowed =
!component ||
!store.actions.components.getDefinition(component._component)?.hasChildren
$: definition = store.actions.components.getDefinition(component?._component)
$: noChildrenAllowed = !component || !definition?.hasChildren
$: noPaste = !$store.componentToPaste
const lastPartOfName = c => (c ? last(c._component.split("/")) : "")
@ -130,7 +129,7 @@
<ConfirmDialog
bind:this={confirmDeleteDialog}
title="Confirm Deletion"
body={`Are you sure you wish to delete this '${lastPartOfName(component)}' component?`}
body={`Are you sure you wish to delete this '${definition?.name}' component?`}
okText="Delete Component"
onOk={deleteComponent} />

2
packages/builder/src/components/design/PropertiesPanel/PropertyControls/EventsEditor/actions/SaveFields.svelte

@ -32,7 +32,7 @@
// this statement initialises fields from parameters.fields
$: fields =
fields ||
Object.keys(parameterFields || { "": "" }).map(name => ({
Object.keys(parameterFields || {}).map(name => ({
name,
value:
(parameterFields &&

Loading…
Cancel
Save