From 5b37776a39bc21e9f3fe86175eb87d1de66acd8b Mon Sep 17 00:00:00 2001 From: Jonathan Weth <git@jonathanweth.de> Date: Sat, 30 Nov 2024 13:38:46 +0100 Subject: [PATCH] Fix substitutions print --- .../chronos/templates/chronos/partials/subs/comment.html | 4 +--- .../chronos/templates/chronos/partials/subs/subject.html | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/comment.html b/aleksis/apps/chronos/templates/chronos/partials/subs/comment.html index 694a0ce3..17cb2f2b 100644 --- a/aleksis/apps/chronos/templates/chronos/partials/subs/comment.html +++ b/aleksis/apps/chronos/templates/chronos/partials/subs/comment.html @@ -1,5 +1,3 @@ -{% if el.title %} - <em>{{ el.title }}</em> -{% elif el.comment %} +{% if el.comment %} <em>{{ el.comment }}</em> {% endif %} diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html b/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html index 033d7b74..6d9f79f2 100644 --- a/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html +++ b/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html @@ -3,10 +3,9 @@ {% trans "Supervision" %} {% elif not el.amends.subject and not el.subject %} {% if el.amends.title %} - <s>{{ el.amends.title }}</s> - {% endif %} - {% if el.title %} - <s>{{ el.title }}</s> + {{ el.amends.title }} + {% elif el.title %} + {{ el.title }} {% endif %} {% elif el.cancelled %} <s>{% include "chronos/partials/subject.html" with subject=el.amends.subject %}</s> -- GitLab