fix auto result mime_type, fix admin task list

diff --git a/timeside/server/admin.py b/timeside/server/admin.py
index 025ef14a336f1f78b1b1fd3788aecc64bfd94498..11916e341e98b6b93ec9c70c7340c0761831901a 100644 (file)
--- a/timeside/server/admin.py
+++ b/timeside/server/admin.py
@@ -4,7 +4,8 @@ from timeside.server.models import *
 
 
 class TaskAdmin(admin.ModelAdmin):
-    list_display = ['date_added', 'date_modified', 'status']
+    model = Task
+    list_display = ['__unicode__', 'date_added', 'date_modified', 'status']
     list_filter = ['date_modified', 'status']
 
 

diff --git a/timeside/server/models.py b/timeside/server/models.py
index fb2f27fea4ef8febb5f687b7311c1ee05166d04d..bed3a7ebd250676626b3a517f901274c20c64ee3 100644 (file)
--- a/timeside/server/models.py
+++ b/timeside/server/models.py
@@ -244,6 +244,10 @@ class Result(BaseResource):
         self.status = status
         self.save()
 
+    def mime_type_setter(self, mime_type):
+        self.mime_type = mime_type
+        self.save()
+
     def __unicode__(self):
         return '_'.join([self.item.title, unicode(self.preset.processor)])
 
@@ -299,9 +303,11 @@ class Task(BaseResource):
                 image_file = str(result.uuid) + '.png'
                 result.file = os.path.join(item_path, image_file)
                 proc.render(output=result.file.path)
+                result.mime_type_setter(get_mime_type(result.file.path))
                 result.status_setter(_DONE)
             elif proc.type == 'encoder':
                 result = Result.objects.get(preset=preset, item=item)
+                result.mime_type_setter(get_mime_type(result.file.path))
                 result.status_setter(_DONE)
             del proc
 

diff --git a/timeside/server/templates/timeside/item_detail.html b/timeside/server/templates/timeside/item_detail.html
index efa126dce18b71f352b8cb3ff3c567f7df5fced9..1bc1adc381a623fcc8fe7f395734e0eb0a63490a 100644 (file)
--- a/timeside/server/templates/timeside/item_detail.html
+++ b/timeside/server/templates/timeside/item_detail.html
@@ -32,7 +32,7 @@ Results:
 
 <ul>
 {% for result in object.results.all %}
-  <li><a href="{% if 'image' in result.mime_type %}{% url "timeside-result-png" result.id %}{% elif 'audio' in result.mime_type %}{% url "timeside-result-audio" result.id %}{% else %}{% url "timeside-result-json" result.id %}{% endif %}">{{ result }}</a> ({{ result.uuid }})</li>
+  <li><a href="{% if 'image' in result.mime_type %}{% url "timeside-result-png" result.id %}{% elif 'audio' in result.mime_type %}{% url "timeside-result-audio" result.id %}{% else %}{% url "timeside-result-json" result.id %}{% endif %}">{{ result }}</a> ({{ result.uuid }} {{ result.hdf5 }})</li>
 {% endfor %}
 <ul>