fix wrong date was displayed : https://trackers.pilotsystems.net/prebarreau/0633

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index 7b56009d6790b0cdf9c6e462b08c1a091736996c..4dba066f5059430c3270e2af2e6b0a77dbdab5cc 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -171,8 +171,10 @@ $(document).ready(function(){
     <dt>{% trans "Room" %}</dt><dd>{{ media.conference.room }}</dd>
 {% endif %}
 
-{% if media.conference.date_publish %}
-    <dt>{% trans "Publishing date" %}</dt><dd>{{ media.conference.date_publish }}</dd>
+
+{% conference_publication media.conference as publication %}
+{% if publication.published %}
+    <dt>{% trans "Publishing date" %}</dt><dd>{{ publication.publication_date }}</dd>
 {% else %}
     <dt>{% trans "Begin date" %}</dt><dd>{{ media.conference.date_begin }}</dd>
 {% endif %}
@@ -187,7 +189,7 @@ $(document).ready(function(){
     <dt>{% trans "End date" %}</dt><dd>{{ media.conference.date_end }}</dd>
     <dt>{% trans "Date added" %}</dt><dd>{{ media.date_added }}</dd>
     <dt>{% trans "Date modified" %}</dt><dd>{{ media.date_modified }}</dd>
-    <dt>{% trans "Publishing date" %}</dt><dd>{{ media.conference.date_publish }}</dd>
+    <dt>{% trans "Publishing date" %}</dt><dd>{{ publication.publication_date }}</dd>
     <dt>{% trans "Media ID" %}</dt><dd>{{ media.id }}</dd>
     <dt>{% trans "Conference ID" %}</dt><dd>{{ media.conference.public_id }}</dd>
     <dt>{% trans "Web class group" %}</dt><dd>{{ media.conference.web_class_group }}</dd>

diff --git a/teleforma/templates/teleforma/inc/media_list.html b/teleforma/templates/teleforma/inc/media_list.html
index fd526ef4e204c7f34843cd9f22c965068a2d441d..a1ee6d053d146f53326c3ed87b129cd4559e7a71 100644 (file)
--- a/teleforma/templates/teleforma/inc/media_list.html
+++ b/teleforma/templates/teleforma/inc/media_list.html
@@ -28,6 +28,7 @@
             {% comment %}<div>{% trans 'Click here' %}</div>{% endcomment %}
             </a>
             </td>
+            {% conference_publication conference as publication %}
             <td {% if forloop.first %}class="border-top"{% endif %} width="60%" style="padding-left: 1em;">
                 <div>
                     <dl class="listing" style="font-size: 1.2em;">
@@ -36,8 +37,8 @@
                     {% if conference.professor %}
                     <dt>{% trans "Professor" %}</dt><dd>{{ conference.professor }}</dd>
                     {% endif %}
-                    {% if conference.date_publish %}
-                        <dt>{% trans "Publishing date" %}</dt><dd>{{ conference.date_publish }}</dd>
+                    {% if publication.published %}
+                        <dt>{% trans "Publishing date" %}</dt><dd>{{ publication.publication_date }}</dd>
                     {% else %}
                         <dt>{% trans "Begin date" %}</dt><dd>{{ conference.date_begin }}</dd>
                     {% endif %}
@@ -51,7 +52,6 @@
                  </div>
             </td>
             
-            {% conference_publication conference as publication %}
             <td {% if forloop.first %}class="border-top"{% endif %} width="10%" align="center">
             {% if user.is_staff or user.professor.count %}
                 {% if publication.published %}