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

Fix archive button on collection module collection overview

Browse Source 
Fixes #3826
This commit is contained in:
rijkvanzanten
2021-01-29 18:39:01 -05:00
parent 5d96529341
commit 3103d9d7ea
1 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/modules/collections/routes/collection.vue
View File

@@ -22,24 +22,14 @@
:saving="creatingBookmark"
>
<template #activator="{ on }">
<v-icon
class="toggle"
@click="on"
name="bookmark_outline"
v-tooltip.right="$t('create_bookmark')"
/>
<v-icon class="toggle" @click="on" name="bookmark_outline" v-tooltip.right="$t('create_bookmark')" />
</template>
</bookmark-add>
<v-icon class="saved" name="bookmark" v-else-if="bookmarkSaved" />
<template v-else-if="bookmarkIsMine">
<v-icon
class="save"
@click="savePreset()"
name="bookmark_save"
v-tooltip.bottom="$t('update_bookmark')"
/>
<v-icon class="save" @click="savePreset()" name="bookmark_save" v-tooltip.bottom="$t('update_bookmark')" />
</template>
<bookmark-add
@@ -109,7 +99,7 @@
:disabled="batchArchiveAllowed !== true"
rounded
icon
class="action-soft-delete"
class="action-archive"
@click="on"
v-tooltip.bottom="batchArchiveAllowed ? $t('archive') : $t('not_allowed')"
>
@@ -124,7 +114,7 @@
<v-button @click="confirmArchive = false" secondary>
{{ $t('cancel') }}
</v-button>
<v-button @click="batchDelete" class="action-soft-delete" :loading="archiving">
<v-button @click="archive" class="action-archive" :loading="archiving">
{{ $t('archive') }}
</v-button>
</v-card-actions>
@@ -230,11 +220,7 @@
</sidebar-detail>
<layout-sidebar-detail @input="layout = $event" :value="layout" />
<portal-target name="sidebar" />
<export-sidebar-detail
:layout-query="layoutQuery"
:search-query="searchQuery"
:collection="currentCollection"
/>
<export-sidebar-detail :layout-query="layoutQuery" :search-query="searchQuery" :collection="currentCollection" />
</template>
<v-dialog v-if="deleteError" active>
@@ -337,13 +323,7 @@ export default defineComponent({
batchEditActive,
} = useBatch();
const {
bookmarkDialogActive,
creatingBookmark,
createBookmark,
editingBookmark,
editBookmark,
} = useBookmarks();
const { bookmarkDialogActive, creatingBookmark, createBookmark, editingBookmark, editBookmark } = useBookmarks();
watch(
collection,
@@ -596,7 +576,7 @@ export default defineComponent({
--v-button-color-hover: var(--danger);
}
.action-soft-delete {
.action-archive {
--v-button-background-color: var(--warning-25);
--v-button-color: var(--warning);
--v-button-background-color-hover: var(--warning-50);