From: Guillaume Pellerin Date: Mon, 3 Mar 2014 22:49:50 +0000 (+0100) Subject: Merge branch 'dev' into crem X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=471a57708f833a4382079b55e758ca9102a8aa53;p=telemeta.git Merge branch 'dev' into crem --- 471a57708f833a4382079b55e758ca9102a8aa53 diff --cc telemeta/views/item.py index a6c8ac7c,99329d60..39b6bc38 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@@ -345,9 -346,9 +345,9 @@@ class ItemView(object) return redirect('telemeta-collection-detail', collection.code) def item_analyze(self, item): - analyses = MediaItemAnalysis.objects.filter(item=item) + analyses = item.analysis.all() mime_type = '' - + if analyses: for analysis in analyses: if not item.approx_duration and analysis.analyzer_id == 'duration':