From ccc6be4c474b9bbb9abcb946bbd9dfa244ff0c30 Mon Sep 17 00:00:00 2001
From: Nitwel <nitwel@arcor.de>
Date: Tue, 6 Oct 2020 17:54:54 +0200
Subject: [PATCH 1/3] fix back button opening modal

---
 app/src/modules/settings/routes/data-model/fields/fields.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/modules/settings/routes/data-model/fields/fields.vue b/app/src/modules/settings/routes/data-model/fields/fields.vue
index a1d8fd573b..691fcbde48 100644
--- a/app/src/modules/settings/routes/data-model/fields/fields.vue
+++ b/app/src/modules/settings/routes/data-model/fields/fields.vue
@@ -2,7 +2,7 @@
 	<private-view :title="collectionInfo && collectionInfo.name">
 		<template #headline>{{ $t('settings_data_model') }}</template>
 		<template #title-outer:prepend>
-			<v-button class="header-icon" rounded icon exact @click="$router.go(-1)">
+			<v-button class="header-icon" rounded icon exact to="/settings/data-model">
 				<v-icon name="arrow_back" />
 			</v-button>
 		</template>

From cad36ee04254f48a574f30b619827d3ad167a362 Mon Sep 17 00:00:00 2001
From: Nitwel <nitwel@arcor.de>
Date: Tue, 6 Oct 2020 18:18:54 +0200
Subject: [PATCH 2/3] fix going back for others too

---
 app/src/modules/collections/routes/detail.vue | 2 +-
 app/src/modules/files/routes/detail.vue       | 8 +++++++-
 app/src/modules/users/routes/detail.vue       | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/modules/collections/routes/detail.vue b/app/src/modules/collections/routes/detail.vue
index ec46bb44ac..d83d8ab642 100644
--- a/app/src/modules/collections/routes/detail.vue
+++ b/app/src/modules/collections/routes/detail.vue
@@ -33,7 +33,7 @@
 				secondary
 				exact
 				v-tooltip.bottom="$t('back')"
-				@click="$router.go(-1)"
+				:to="'/collections/'+collection"
 			>
 				<v-icon name="arrow_back" />
 			</v-button>
diff --git a/app/src/modules/files/routes/detail.vue b/app/src/modules/files/routes/detail.vue
index 2555d8d1a7..6ab517d6a4 100644
--- a/app/src/modules/files/routes/detail.vue
+++ b/app/src/modules/files/routes/detail.vue
@@ -2,7 +2,7 @@
 	<files-not-found v-if="!loading && !item" />
 	<private-view v-else :title="loading || !item ? $t('loading') : item.title">
 		<template #title-outer:prepend>
-			<v-button class="header-icon" rounded icon secondary exact @click="$router.go(-1)">
+			<v-button class="header-icon" rounded icon secondary exact :to="to">
 				<v-icon name="arrow_back" />
 			</v-button>
 		</template>
@@ -286,6 +286,11 @@ export default defineComponent({
 				.filter((field: Field) => fieldsDenyList.includes(field.field) === false);
 		});
 
+		const to = computed(() => {
+			if(item.value?.folder !== undefined) return `/files?folder=${item.value.folder}`
+			else return '/files'
+		})
+
 		const { formFields } = useFormFields(fieldsFiltered);
 
 		const confirmLeave = ref(false);
@@ -327,6 +332,7 @@ export default defineComponent({
 			selectedFolder,
 			fileSrc,
 			form,
+			to
 		};
 
 		function changeCacheBuster() {
diff --git a/app/src/modules/users/routes/detail.vue b/app/src/modules/users/routes/detail.vue
index 623b80a52f..2d12dc23ac 100644
--- a/app/src/modules/users/routes/detail.vue
+++ b/app/src/modules/users/routes/detail.vue
@@ -1,7 +1,7 @@
 <template>
 	<private-view :title="title">
 		<template #title-outer:prepend>
-			<v-button class="header-icon" rounded icon secondary exact @click="$router.go(-1)">
+			<v-button class="header-icon" rounded icon secondary exact to="/users">
 				<v-icon name="arrow_back" />
 			</v-button>
 		</template>

From c2f3d992e855ae86bb9085675f4b1f716c30c738 Mon Sep 17 00:00:00 2001
From: Rijk van Zanten <rijkvanzanten@me.com>
Date: Tue, 6 Oct 2020 13:09:10 -0400
Subject: [PATCH 3/3] Update app/src/modules/collections/routes/detail.vue

---
 app/src/modules/collections/routes/detail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/modules/collections/routes/detail.vue b/app/src/modules/collections/routes/detail.vue
index d83d8ab642..b3e191db7b 100644
--- a/app/src/modules/collections/routes/detail.vue
+++ b/app/src/modules/collections/routes/detail.vue
@@ -33,7 +33,7 @@
 				secondary
 				exact
 				v-tooltip.bottom="$t('back')"
-				:to="'/collections/'+collection"
+				:to="'/collections/' + collection"
 			>
 				<v-icon name="arrow_back" />
 			</v-button>