]> git.parisson.com Git - teleforma.git/commitdiff
fix no end
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 10 Aug 2022 08:08:29 +0000 (10:08 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 10 Aug 2022 08:08:29 +0000 (10:08 +0200)
teleforma/models/core.py
teleforma/templates/teleforma/course_media.html
teleforma/templates/teleforma/inc/media_list.html

index bca18815444fa9dc5cd3f10bacb4ca8f4517ce02..acd643c0a2434024e91247c5c4a75c31d54fd5b4 100755 (executable)
@@ -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):
index 2eb283c57b0c1f24aaa9869818166e9fe9442792..27bc622ea3a8cad9c47bcca227d9355c25431d07 100644 (file)
@@ -177,7 +177,9 @@ $(document).ready(function(){
     <dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
 {% endif %}
 
+{% if media.conference.duration %}
     <dt>{% trans "Duration" %}</dt><dd>{{ media.conference.duration }}</dd>
+{% endif %}
 
 {% if user.is_staff or user.is_superuser %}
     <dt>{% trans "Mime type" %}</dt><dd>{{ media.mime_type }}</dd>
index a6c0292f918b514d0b56ea76088b5892b47b6e74..e504a00def0c6c4feeab7931debbd9014b02e835 100644 (file)
@@ -41,7 +41,9 @@
                     {% else %}
                         <dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
                     {% endif %}
-                    <dt>{% trans "Duration" %}</dt><dd>{{ media.conference.duration }}</dd>
+                    {% if media.conference.duration %}
+                        <dt>{% trans "Duration" %}</dt><dd>{{ media.conference.duration }}</dd>
+                    {% endif %}
                     {% if media.conference.comment %}
                     <dt>{% trans "Comment" %}</dt><dd>{{ media.conference.comment }}</dd>
                     {% endif %}