]> git.parisson.com Git - timeside.git/commitdiff
fix ogg and video player
authorGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Mar 2015 12:07:03 +0000 (13:07 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Fri, 6 Mar 2015 12:07:03 +0000 (13:07 +0100)
timeside/server/management/commands/timeside-tests-boilerplate.py
timeside/server/templates/timeside/item_detail.html

index 2830773f95024e3b5463d8d42f6756746158c564..3cb3a7d5aeb5d8ebe38e1c6edba9f29a32dab823 100644 (file)
@@ -57,6 +57,6 @@ class Command(BaseCommand):
             if not preset in experience.presets.all():
                 experience.presets.add(preset)
 
-        task, c = Task.objects.get_or_create(experience=experience, selection=selection)
+        task = Task(experience=experience, selection=selection)
         task.status_setter(2)
         task.delete()
index 16c2b6195a6f34ce78816945c4c9fd8d8ff16d90..d3d8424a1031f11736c94a6cb756f9e739cdfc32 100644 (file)
@@ -53,11 +53,16 @@ Your browser does not support the audio element.
     <li>{{ result.preset.processor }} ({{ result.uuid }})
     {% if 'image' in result.mime_type %}
         <img src="{% url "timeside-result-png" result.id %}">
-    {% elif 'audio' in result.mime_type %}
+    {% elif 'audio' in result.mime_type or 'ogg' in result.mime_type%}
      <br>
      <audio controls>
         <source src="{% url "timeside-result-audio" result.id %}" type="{{ result.mime_type }}">
      </audio>
+    {% elif 'video' in result.mime_type %}
+     <br>
+     <video controls>
+        <source src="{% url "timeside-result-audio" result.id %}" type="{{ result.mime_type }}">
+     </video>
     {% else %}
         <a href="{% url "timeside-result-json" result.id %}">JSON</a>
             <button id="add-data">add</button>