+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
+
+
@@ -218,10 +219,13 @@
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
index 6220d9a44..af36d0ca5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
@@ -11,16 +11,6 @@
{{ explainSentence(history_line) }}
-
- {{ trans(CHILL_TICKET_TICKET_HISTORY_MASK_COMMENT) }}
-
-
();
const history = props.history ?? [];
const store = useStore();
-const actionIcons = ref(store.getters.getActionIcons);
-const canBeDisplayed = ref(store.getters.canBeDisplayed);
+const actionIcons = ref>(store.getters.getActionIcons);
+const removedCommentIds = ref(store.getters.getRemovedCommentIds);
const filteredHistoryLines = computed(() =>
history.filter(
- (line: TicketHistoryLine) => !(line.event_type === "add_person"),
+ (line: TicketHistoryLine) =>
+ line.event_type !== "add_person" &&
+ !(
+ line.event_type == "add_comment" &&
+ line.data.deleted &&
+ !removedCommentIds.value.includes(line.data.id)
+ ),
),
);
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index 95e211534..b47eaa035 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -24,6 +24,8 @@ chill_ticket:
addressees: "Par destinataire"
by_addressees: "Par destinataire"
by_motives: "Par motifs"
+ by_ticket_id: "Par numéro de ticket"
+ ticket_id: "Numéro de ticket"
current_state: "État actuel"
open: "Ouvert"
closed: "Clôturé"
@@ -55,7 +57,7 @@ chill_ticket:
create_ticket: "Ticket créé"
state_change: ""
emergency_change: ""
- mask_comment: "Masqué"
+ mask_comment: "Supprimer"
previous_tickets: "Précédents tickets"
actions_toolbar:
cancel: "Annuler"
@@ -67,10 +69,10 @@ chill_ticket:
reopen_success: "Rouverture du ticket réussie"
reopen_error: "Erreur lors de la rouverture du ticket"
visible_comment:
- success: "Commentaire visible"
+ success: "Commentaire restauré"
mask_comment:
- success: "Commentaire masqué"
- hint: "Ce commentaire est masqué; il n'est visible que par vous."
+ success: "Commentaire supprimé"
+ hint: "Ce commentaire a été supprimé."
edit_comment:
title: "Éditer le commentaire"
success: "Commentaire modifié"