]> git.parisson.com Git - teleforma.git/commitdiff
fix media published
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Jul 2012 22:13:35 +0000 (00:13 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 20 Jul 2012 22:13:35 +0000 (00:13 +0200)
FIXME no audio

teleforma/management/commands/teleforma-import-conferences.py
teleforma/templates/teleforma/course_media.html
teleforma/templates/teleforma/inc/media_list.html

index ad2ff60699b6cbb5ae445da24aa04507f2ff154e..5ab374d0917c818776182b5c8b89338e6bd8ec35 100644 (file)
@@ -72,8 +72,8 @@ class Command(BaseCommand):
 
                     department, c = Department.objects.get_or_create(name=department_name,
                                                                      organization=organization)
-
                     if Conference.objects.filter(public_id=public_id):
+                        print path
                         conference = Conference.objects.get(public_id=public_id)
                         conference.course = Course.objects.get(code=course_id)
                         conference.course_type = CourseType.objects.get(name=course_type)
index 77d1b05acb2885284ffe53c3ff281ed766be4643..72d5095ac020f800e454e0a4c2a5801eea8a3658 100644 (file)
@@ -61,7 +61,8 @@ $(document).ready(function(){
 
 {% elif "audio" in media.item.mime_type %}
 <div class="audio">
-<iframe width='640' height='200' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src="{% url telemeta-item-player-contour  media.item.public_id 640 130 %}"></iframe>
+<!--<iframe width='640' height='200' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src="{% url telemeta-item-player-contour  media.item.public_id 640 130 %}"></iframe>
+-->
 </div>
 {% endif %}
 
index 92ed38b33a2f09e40e2c3e359ffdb08e3349a80c..710f43ee1a87d875e4c75f9866e56340d766a480 100644 (file)
@@ -10,7 +10,7 @@
     <table class="listing" width="100%">
     <tbody>
         {% for media in course.media.all|from_course_type:type %}
-         {% if media.published or user.is_staff %}
+         {% if media.is_published or user.is_staff %}
           {% if media.type == 'webm' %}
             <tr>
             <td {% if forloop.first %}class="border-top"{% endif %} width="230px">
@@ -44,4 +44,4 @@
     </tbody>
     </table>
 </div>
-{% endif %}
\ No newline at end of file
+{% endif %}