github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-28 10:28:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Support recommended displays in field setup

Browse Source
This commit is contained in:
rijkvanzanten
2020-09-03 16:36:13 -04:00
parent 7f1d797c50
commit e23526536e
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/lang/en-US/index.json
View File

@@ -258,6 +258,8 @@
"this_collection": "This Collection",
"related_collection": "Related Collection",
"related_values": "Related Values",
"last_page": "Last Page",
"last_login": "Last Login",

2
app/src/modules/settings/routes/data-model/field-detail/components/display.vue
View File

@@ -76,7 +76,7 @@ export default defineComponent({
return item;
});
if (displayItems.length >= 5) {
if (displayItems.length >= 5 && recommended.length > 0) {
return [
...recommended.map((key) => displayItems.find((item) => item.value === key)),
{ divider: true },

2
app/src/modules/settings/routes/data-model/field-detail/components/interface.vue
View File

@@ -109,7 +109,7 @@ export default defineComponent({
return item;
});
if (interfaceItems.length >= 5) {
if (interfaceItems.length >= 5 && recommended.length > 0) {
return [
...recommended.map((key) => interfaceItems.find((item) => item.value === key)),
{ divider: true },

6
app/src/modules/settings/routes/data-model/fields/fields.vue
View File

@@ -89,7 +89,7 @@ import FieldsManagement from './components/fields-management.vue';
import useItem from '@/composables/use-item';
import router from '@/router';
import { useCollectionsStore } from '@/stores';
import { useCollectionsStore, useFieldsStore } from '@/stores';
import marked from 'marked';
export default defineComponent({
@@ -114,6 +114,7 @@ export default defineComponent({
const { collection } = toRefs(props);
const { info: collectionInfo, fields } = useCollection(collection);
const collectionsStore = useCollectionsStore();
const fieldsStore = useFieldsStore();
const { isNew, edits, item, saving, loading, error, save, remove, deleting, saveAsCopy, isBatch } = useItem(
ref('directus_collections'),
@@ -147,12 +148,15 @@ export default defineComponent({
async function deleteAndQuit() {
await remove();
await collectionsStore.hydrate();
await fieldsStore.hydrate();
router.push(`/settings/data-model`);
}
async function saveAndQuit() {
await save();
await collectionsStore.hydrate();
await fieldsStore.hydrate();
router.push(`/settings/data-model`);
}
},