mirror of
				https://gitlab.com/Chill-Projet/chill-bundles.git
				synced 2025-11-04 03:08:25 +00:00 
			
		
		
		
	Merge branch '376-typeerror-doc-history' into 'master'
#376 prevent typerror in doc-history + improve display of document history Closes #376 See merge request Chill-Projet/chill-bundles!820
This commit is contained in:
		
							
								
								
									
										7
									
								
								.changes/unreleased/Fixed-20250424-133943.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								.changes/unreleased/Fixed-20250424-133943.yaml
									
									
									
									
									
										Normal 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
 | 
			
		||||
@@ -53,7 +53,7 @@ const onRestored = ({
 | 
			
		||||
<template>
 | 
			
		||||
    <template v-if="props.versions.length > 0">
 | 
			
		||||
        <div class="container">
 | 
			
		||||
            <template v-for="v in props.versions">
 | 
			
		||||
            <template v-for="v in props.versions" :key="v.id">
 | 
			
		||||
                <history-button-list-item
 | 
			
		||||
                    :version="v"
 | 
			
		||||
                    :can-edit="canEdit"
 | 
			
		||||
 
 | 
			
		||||
@@ -32,13 +32,17 @@ const onRestore = ({
 | 
			
		||||
    emit("restoreVersion", { newVersion });
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
const isKeptBeforeConversion = computed<boolean>(() =>
 | 
			
		||||
    props.version["point-in-times"].reduce(
 | 
			
		||||
        (accumulator: boolean, pit: StoredObjectPointInTime) =>
 | 
			
		||||
            accumulator || "keep-before-conversion" === pit.reason,
 | 
			
		||||
        false,
 | 
			
		||||
    ),
 | 
			
		||||
);
 | 
			
		||||
const isKeptBeforeConversion = computed<boolean>(() => {
 | 
			
		||||
    if ("point-in-times" in props.version) {
 | 
			
		||||
        return props.version["point-in-times"].reduce(
 | 
			
		||||
            (accumulator: boolean, pit: StoredObjectPointInTime) =>
 | 
			
		||||
                accumulator || "keep-before-conversion" === pit.reason,
 | 
			
		||||
            false,
 | 
			
		||||
        );
 | 
			
		||||
    } else {
 | 
			
		||||
        return false;
 | 
			
		||||
    }
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
const isRestored = computed<boolean>(
 | 
			
		||||
    () => props.version.version > 0 && null !== props.version["from-restored"],
 | 
			
		||||
@@ -90,11 +94,11 @@ const classes = computed<{
 | 
			
		||||
        <div class="col-12">
 | 
			
		||||
            <file-icon :type="version.type"></file-icon>
 | 
			
		||||
            <span
 | 
			
		||||
                ><strong>#{{ version.version + 1 }}</strong></span
 | 
			
		||||
                ><strong> #{{ version.version + 1 }} </strong></span
 | 
			
		||||
            >
 | 
			
		||||
            <template
 | 
			
		||||
                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>
 | 
			
		||||
                <span class="badge-user"
 | 
			
		||||
                    ><UserRenderBoxBadge
 | 
			
		||||
 
 | 
			
		||||
@@ -20,9 +20,11 @@
 | 
			
		||||
                    {{ mm.mimeIcon(document.object.type) }}
 | 
			
		||||
                </div>
 | 
			
		||||
            {% endif %}
 | 
			
		||||
            <div>
 | 
			
		||||
                <p>{{ document.category.name|localize_translatable_string }}</p>
 | 
			
		||||
            </div>
 | 
			
		||||
            {% if document.category %}
 | 
			
		||||
                <div>
 | 
			
		||||
                    <p>{{ document.category.name|localize_translatable_string }}</p>
 | 
			
		||||
                </div>
 | 
			
		||||
            {% endif %}
 | 
			
		||||
            {% if document.object.hasTemplate %}
 | 
			
		||||
                <div>
 | 
			
		||||
                    <p>{{ document.object.template.name|localize_translatable_string }}</p>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user