From 97a7d8a622186c78f3a946f5a5973ba24afe748f Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 10 Aug 2022 10:08:29 +0200 Subject: [PATCH] fix no end --- teleforma/models/core.py | 7 +++++-- teleforma/templates/teleforma/course_media.html | 2 ++ teleforma/templates/teleforma/inc/media_list.html | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/teleforma/models/core.py b/teleforma/models/core.py index bca18815..acd643c0 100755 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -404,8 +404,11 @@ class Conference(models.Model): @property def duration(self): - return self.date_end.replace(microsecond=0) - \ - self.date_begin.replace(microsecond=0) + if self.date_end: + return self.date_end.replace(microsecond=0) - \ + self.date_begin.replace(microsecond=0) + else: + return None @property def slug(self): diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html index 2eb283c5..27bc622e 100644 --- a/teleforma/templates/teleforma/course_media.html +++ b/teleforma/templates/teleforma/course_media.html @@ -177,7 +177,9 @@ $(document).ready(function(){
{% trans "Begin date" %}
{{ media.conference.date_begin }}
{% endif %} +{% if media.conference.duration %}
{% trans "Duration" %}
{{ media.conference.duration }}
+{% endif %} {% if user.is_staff or user.is_superuser %}
{% trans "Mime type" %}
{{ media.mime_type }}
diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html index a6c0292f..e504a00d 100644 --- a/teleforma/templates/teleforma/inc/media_list.html +++ b/teleforma/templates/teleforma/inc/media_list.html @@ -41,7 +41,9 @@ {% else %}
{% trans "Begin date" %}
{{ media.conference.date_begin }}
{% endif %} -
{% trans "Duration" %}
{{ media.conference.duration }}
+ {% if media.conference.duration %} +
{% trans "Duration" %}
{{ media.conference.duration }}
+ {% endif %} {% if media.conference.comment %}
{% trans "Comment" %}
{{ media.conference.comment }}
{% endif %} -- 2.39.5