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

Merge pull request #547 from directus/fix-545

Browse Source 
Fix back button opening modal
This commit is contained in:
Rijk van Zanten
2020-10-06 13:09:16 -04:00
committed by GitHub
parent da8a6a1502 c2f3d992e8
commit f3ea4377af
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/modules/collections/routes/detail.vue
View File

@@ -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>

8
app/src/modules/files/routes/detail.vue
View File

@@ -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() {

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

@@ -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>

2
app/src/modules/users/routes/detail.vue
View File

@@ -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>