From 187384b8311e5b690b5addf2ba32e1a62ec3f406 Mon Sep 17 00:00:00 2001
From: Nitwel <nitwel@arcor.de>
Date: Tue, 30 Mar 2021 19:02:35 +0200
Subject: [PATCH] Fix sort field not nullable (#4747)

* make input nullable

* remove nullable
---
 .../data-model/field-detail/components/relationship-m2a.vue   | 4 +---
 .../data-model/field-detail/components/relationship-m2m.vue   | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2a.vue b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2a.vue
index 4874ceadb9..6f38f71dd0 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2a.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2a.vue
@@ -1,6 +1,5 @@
 <template>
 	<div>
-
 		<div class="grid">
 			<div class="field">
 				<div class="type-label">{{ $t('this_collection') }}</div>
@@ -196,7 +195,6 @@
 			<v-input
 				:class="{ matches: junctionFieldExists(relations[0].sort_field) }"
 				v-model="relations[0].sort_field"
-				:nullable="false"
 				:placeholder="$t('add_sort_field') + '...'"
 				db-safe
 			>
@@ -406,8 +404,8 @@ export default defineComponent({
 }
 
 .related-collections-preview {
-	grid-column: 3;
 	grid-row: 2 / span 2;
+	grid-column: 3;
 	padding: var(--input-padding);
 	overflow: auto;
 	color: var(--foreground-subdued);
diff --git a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2m.vue b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2m.vue
index 8fdd8e3456..d94ea26fe7 100644
--- a/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2m.vue
+++ b/app/src/modules/settings/routes/data-model/field-detail/components/relationship-m2m.vue
@@ -1,6 +1,5 @@
 <template>
 	<div>
-
 		<div class="grid">
 			<div class="field">
 				<div class="type-label">{{ $t('this_collection') }}</div>
@@ -224,7 +223,6 @@
 			<v-input
 				:class="{ matches: junctionFieldExists(relations[0].sort_field) }"
 				v-model="relations[0].sort_field"
-				:nullable="false"
 				:placeholder="$t('add_sort_field') + '...'"
 				db-safe
 			>