fix item delete

diff --git a/telemeta/models/core.py b/telemeta/models/core.py
index 98572b9f5348f449fe0c3a28deaa18b04b9e4bcf..a5ed16a1a5a8d0471da436edfe4c3738320c69a1 100644 (file)
--- a/telemeta/models/core.py
+++ b/telemeta/models/core.py
@@ -228,10 +228,11 @@ class EnhancedQuerySet(models.query.QuerySet):
         CHUNK=1024
         objects = self.model._meta.get_all_related_objects()
         ii = self.count()
+        values = self.values_list('pk')
         for related in objects:
             i = 0
             while i < ii:
-                ids = [v[0].values_list('pk') for v in self[i:i + CHUNK]]
+                ids = [v[0] for v in values[i:i + CHUNK]]
                 filter = {related.field.name + '__pk__in': ids}
                 q = related.model.objects.filter(**filter)
                 if isinstance(related.field, WeakForeignKey):

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index 569ebb814e5e71d7ae7c9470d2655d71be3a1e28..d9599856fbd257989b100bfaf1207cda84ef4f9b 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -81,7 +81,7 @@ def stream_from_file(file):
         yield _chunk
     f.close()
 
-class WebView:
+class WebView(object):
     """Provide web UI methods"""
 
     graphers = timeside.core.processors(timeside.api.IGrapher)
@@ -221,15 +221,14 @@ class WebView:
 
         mime_type = encoder.mime_type()
         file = public_id + '.' + encoder.file_extension()
-        
         item = MediaItem.objects.get(public_id=public_id)
         audio = item.file.path
         decoder = timeside.decoder.FileDecoder(audio)
 
         if decoder.format() == mime_type:
             # source > stream
-            #print item.file.path
             response = HttpResponse(stream_from_file(audio), mimetype = mime_type)
+            
         else:        
             if not self.cache_export.exists(file):
                 # source > encoder > stream