github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into user-invite

Browse Source
This commit is contained in:
rijkvanzanten
2020-10-20 15:24:25 -04:00
parent dd5ea08c8c 932cd4a93a
commit 1ca5e68c5d
21 changed files with 78 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/modules/collections/routes/item.vue
View File

@@ -10,7 +10,12 @@
</h1>
</template>
<template #title v-else-if="isNew === false && isBatch === false && collectionInfo.meta.display_template">
<template
#title
v-else-if="
isNew === false && isBatch === false && collectionInfo.meta && collectionInfo.meta.display_template
"
>
<v-skeleton-loader class="title-loader" type="text" v-if="loading" />
<h1 class="type-title" v-else>

9
app/src/modules/settings/routes/data-model/fields/components/field-select.vue
View File

@@ -207,6 +207,7 @@ import { getInterfaces } from '@/interfaces';
import router from '@/router';
import notify from '@/utils/notify';
import { i18n } from '@/lang';
import { cloneDeep } from 'lodash';
import { getLocalTypeForField } from '../../get-local-type';
export default defineComponent({
@@ -323,8 +324,8 @@ export default defineComponent({
};
async function saveDuplicate() {
const newField: any = {
...props.field,
const newField: Record<string, any> = {
...cloneDeep(props.field),
field: duplicateName.value,
collection: duplicateTo.value,
};
@@ -334,6 +335,10 @@ export default defineComponent({
delete newField.meta.sort;
}
if (newField.schema) {
delete newField.schema.comment;
}
delete newField.name;
duplicating.value = true;