github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Replace template with p element (#19004)

Browse Source 
* Replace template with p element

* Add changeset

---------

Co-authored-by: Brainslug <br41nslug@users.noreply.github.com>
Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
This commit is contained in:
Gerard Lamusse
2023-06-27 21:28:58 +02:00
committed by GitHub
parent 63069bd688
commit 14283e2da2
2 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/modern-bananas-count.md Normal file
View File

@@ -0,0 +1,5 @@
---
'@directus/app': patch
---
Fixed issue that could cause the export drawer to hang on export

76
app/src/views/private/components/export-sidebar-detail.vue
View File

@@ -137,51 +137,45 @@
<v-notice class="full" :type="lockedToFiles ? 'warning' : 'normal'">
<div>
<p>
<template v-if="itemCountLoading">
{{ t('loading') }}
</template>
<template v-else-if="exportSettings.limit === 0 || itemCount === 0">
{{ t('exporting_no_items_to_export') }}
</template>
<template
v-else-if="
!exportSettings.limit ||
exportSettings.limit === -1 ||
(itemCount && exportSettings.limit >= itemCount)
"
>
{{
t('exporting_all_items_in_collection', {
total: itemCount ? n(itemCount) : '??',
collection: collectionInfo?.name,
})
}}
</template>
<template v-else-if="itemCount && itemCount > exportSettings.limit">
{{
t('exporting_limited_items_in_collection', {
limit: exportSettings.limit ? n(exportSettings.limit) : '??',
total: itemCount ? n(itemCount) : '??',
collection: collectionInfo?.name,
})
}}
</template>
<p v-if="itemCountLoading">
{{ t('loading') }}
</p>
<p v-else-if="exportSettings.limit === 0 || itemCount === 0">
{{ t('exporting_no_items_to_export') }}
</p>
<p
v-else-if="
!exportSettings.limit || exportSettings.limit === -1 || (itemCount && exportSettings.limit >= itemCount)
"
>
{{
t('exporting_all_items_in_collection', {
total: itemCount ? n(itemCount) : '??',
collection: collectionInfo?.name,
})
}}
</p>
<p>
<template v-if="lockedToFiles">
{{ t('exporting_batch_hint_forced', { format: t(format) }) }}
</template>
<p v-else-if="itemCount && itemCount > exportSettings.limit">
{{
t('exporting_limited_items_in_collection', {
limit: exportSettings.limit ? n(exportSettings.limit) : '??',
total: itemCount ? n(itemCount) : '??',
collection: collectionInfo?.name,
})
}}
</p>
<template v-else-if="location === 'files'">
{{ t('exporting_batch_hint', { format: t(format) }) }}
</template>
<p v-if="lockedToFiles">
{{ t('exporting_batch_hint_forced', { format: t(format) }) }}
</p>
<template v-else>
{{ t('exporting_download_hint', { format: t(format) }) }}
</template>
<p v-else-if="location === 'files'">
{{ t('exporting_batch_hint', { format: t(format) }) }}
</p>
<p v-else>
{{ t('exporting_download_hint', { format: t(format) }) }}
</p>
</div>
</v-notice>