Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

#376 prevent typerror in doc-history + improve display of document history

Browse Source
This commit is contained in:
juminet 2025-05-13 07:50:52 +00:00 committed by Julien Fastré
parent 3e7f03d331
commit 2275b7c560
4 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.changes/unreleased/Fixed-20250424-133943.yaml Normal file
View File

@ -0,0 +1,7 @@
kind: Fixed
body: trying to prevent bug of typeerror in doc-history + improved display of document
history
time: 2025-04-24T13:39:43.878468232+02:00
custom:
Issue: "376"
SchemaChange: No schema change

2
src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue
View File

@ -53,7 +53,7 @@ const onRestored = ({
<template> <template>
<template v-if="props.versions.length > 0"> <template v-if="props.versions.length > 0">
<div class="container"> <div class="container">
<template v-for="v in props.versions"> <template v-for="v in props.versions" :key="v.id">
<history-button-list-item <history-button-list-item
:version="v" :version="v"
:can-edit="canEdit" :can-edit="canEdit"

14
src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
View File

@ -32,13 +32,17 @@ const onRestore = ({
emit("restoreVersion", { newVersion }); emit("restoreVersion", { newVersion });
}; };
const isKeptBeforeConversion = computed<boolean>(() => const isKeptBeforeConversion = computed<boolean>(() => {
props.version["point-in-times"].reduce( if ("point-in-times" in props.version) {
return props.version["point-in-times"].reduce(
(accumulator: boolean, pit: StoredObjectPointInTime) => (accumulator: boolean, pit: StoredObjectPointInTime) =>
accumulator || "keep-before-conversion" === pit.reason, accumulator || "keep-before-conversion" === pit.reason,
false, false,
),
); );
} else {
return false;
}
});
const isRestored = computed<boolean>( const isRestored = computed<boolean>(
() => props.version.version > 0 && null !== props.version["from-restored"], () => props.version.version > 0 && null !== props.version["from-restored"],
@ -90,11 +94,11 @@ const classes = computed<{
<div class="col-12"> <div class="col-12">
<file-icon :type="version.type"></file-icon> <file-icon :type="version.type"></file-icon>
<span <span
><strong>#{{ version.version + 1 }}</strong></span ><strong>&nbsp;#{{ version.version + 1 }}&nbsp;</strong></span
> >
<template <template
v-if="version.createdBy !== null && version.createdAt !== null" v-if="version.createdBy !== null && version.createdAt !== null"
><strong v-if="version.version == 0">Créé par</strong ><strong v-if="version.version == 0">créé par</strong
><strong v-else>modifié par</strong> ><strong v-else>modifié par</strong>
<span class="badge-user" <span class="badge-user"
><UserRenderBoxBadge ><UserRenderBoxBadge

2
src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item_row.html.twig
View File

@ -20,9 +20,11 @@
{{ mm.mimeIcon(document.object.type) }} {{ mm.mimeIcon(document.object.type) }}
</div> </div>
{% endif %} {% endif %}
{% if document.category %}
<div> <div>
<p>{{ document.category.name|localize_translatable_string }}</p> <p>{{ document.category.name|localize_translatable_string }}</p>
</div> </div>
{% endif %}
{% if document.object.hasTemplate %} {% if document.object.hasTemplate %}
<div> <div>
<p>{{ document.object.template.name|localize_translatable_string }}</p> <p>{{ document.object.template.name|localize_translatable_string }}</p>