From 1105939080a88a80febcd0d27c2ada426e1a740a Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 18 Oct 2016 15:16:51 +0200 Subject: [PATCH] Fix parent event data --- .../agenda/includes/event_linecard.html | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/app/templates/agenda/includes/event_linecard.html b/app/templates/agenda/includes/event_linecard.html index 23796806..47e8392d 100644 --- a/app/templates/agenda/includes/event_linecard.html +++ b/app/templates/agenda/includes/event_linecard.html @@ -40,25 +40,19 @@
{% keywords_for event as tags %} - {% if event.departments.all.0 or tags %} -
- {% if event.departments.all.0 %} -
- {{ event.departments.all.0.department.name }} -
- {% endif %} - {% if event.category %} -
- {{ event.category }} -
- {% endif %} +
+
+ {% if event.departments.all %}{{ event.departments.all.0.department.name }}{% else %}{{ event.parent.departments.all.0.department.name }}{% endif %}
- {% endif %} +
+ {% if event.category %}{{ event.category }}{% else %}{{ event.parent.category }}{% endif %} +
+

{{ event.title }}

- {{ event.description|slice:":100" }} + {% if event.description %}{{ event.description|slice:":100" }}{% else %}{{ event.parent.description|slice:":100" }}{% endif %}
-- 2.39.5