github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-02-02 12:25:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

Default field sort order to database ordinal sort

Browse Source 
And use alphabetical where appropriate

Fixes #4341
This commit is contained in:
rijkvanzanten
2021-03-03 18:36:21 -05:00
parent c3dd7023a7
commit eb4deaa955
10 changed files with 89 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,7 +313,7 @@ export default defineComponent({
const junctionFields = computed(() => {
if (!junctionCollection.value) return [];
return fieldsStore.getFieldsForCollection(junctionCollection.value).map((field: Field) => ({
return fieldsStore.getFieldsForCollectionAlphabetical(junctionCollection.value).map((field: Field) => ({
text: field.field,
value: field.field,
disabled:

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

@@ -346,7 +346,7 @@ export default defineComponent({
const junctionFields = computed(() => {
if (!junctionCollection.value) return [];
return fieldsStore.getFieldsForCollection(junctionCollection.value).map((field: Field) => ({
return fieldsStore.getFieldsForCollectionAlphabetical(junctionCollection.value).map((field: Field) => ({
text: field.field,
value: field.field,
disabled:

14
app/src/modules/settings/routes/data-model/field-detail/components/relationship-o2m.vue
View File

@@ -248,12 +248,14 @@ export default defineComponent({
const fields = computed(() => {
if (!state.relations[0].many_collection) return [];
return fieldsStore.getFieldsForCollection(state.relations[0].many_collection).map((field: Field) => ({
text: field.field,
value: field.field,
disabled:
!field.schema || field.schema?.is_primary_key || field.type !== currentCollectionPrimaryKey.value.type,
}));
return fieldsStore
.getFieldsForCollectionAlphabetical(state.relations[0].many_collection)
.map((field: Field) => ({
text: field.field,
value: field.field,
disabled:
!field.schema || field.schema?.is_primary_key || field.type !== currentCollectionPrimaryKey.value.type,
}));
});
const collectionMany = computed({