Merge branch 'master' into remove-mongodb-mock
This commit is contained in:
commit
5ecefa217a
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "2.22.11",
|
"version": "2.22.12",
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"packages": [
|
"packages": [
|
||||||
"packages/*",
|
"packages/*",
|
||||||
|
|
|
@ -34,12 +34,7 @@
|
||||||
import { getBindings } from "components/backend/DataTable/formula"
|
import { getBindings } from "components/backend/DataTable/formula"
|
||||||
import JSONSchemaModal from "./JSONSchemaModal.svelte"
|
import JSONSchemaModal from "./JSONSchemaModal.svelte"
|
||||||
import { ValidColumnNameRegex } from "@budibase/shared-core"
|
import { ValidColumnNameRegex } from "@budibase/shared-core"
|
||||||
import {
|
import { FieldType, FieldSubtype, SourceName } from "@budibase/types"
|
||||||
FieldType,
|
|
||||||
FieldSubtype,
|
|
||||||
SourceName,
|
|
||||||
FieldTypeSubtypes,
|
|
||||||
} from "@budibase/types"
|
|
||||||
import RelationshipSelector from "components/common/RelationshipSelector.svelte"
|
import RelationshipSelector from "components/common/RelationshipSelector.svelte"
|
||||||
import { RowUtils } from "@budibase/frontend-core"
|
import { RowUtils } from "@budibase/frontend-core"
|
||||||
import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
|
import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
|
||||||
|
@ -710,21 +705,6 @@
|
||||||
thin
|
thin
|
||||||
text="Allow multiple users"
|
text="Allow multiple users"
|
||||||
/>
|
/>
|
||||||
{:else if editableColumn.type === FieldType.ATTACHMENT}
|
|
||||||
<Toggle
|
|
||||||
value={editableColumn.subtype !== FieldTypeSubtypes.ATTACHMENT.SINGLE &&
|
|
||||||
// Checking config before the subtype was added
|
|
||||||
editableColumn.constraints?.length?.maximum !== 1}
|
|
||||||
on:change={e => {
|
|
||||||
if (!e.detail) {
|
|
||||||
editableColumn.subtype = FieldTypeSubtypes.ATTACHMENT.SINGLE
|
|
||||||
} else {
|
|
||||||
delete editableColumn.subtype
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
thin
|
|
||||||
text="Allow multiple"
|
|
||||||
/>
|
|
||||||
{/if}
|
{/if}
|
||||||
{#if editableColumn.type === AUTO_TYPE || editableColumn.autocolumn}
|
{#if editableColumn.type === AUTO_TYPE || editableColumn.autocolumn}
|
||||||
<Select
|
<Select
|
||||||
|
|
Loading…
Reference in New Issue