]> git.parisson.com Git - telemeta.git/commitdiff
add timeside staging filter
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Dec 2014 17:31:39 +0000 (18:31 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 22 Dec 2014 17:31:39 +0000 (18:31 +0100)
telemeta/urls.py
telemeta/views/item.py

index 976546899941fca3dfee5aa8debd5361e814acef..8c4a9ee552b2e9a1ec367e11cb6f6185ebefde0e 100644 (file)
@@ -232,9 +232,7 @@ urlpatterns = patterns('',
 if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS:
     import debug_toolbar
     urlpatterns += patterns('',
-    url(r'^__debug__/', include(debug_toolbar.urls)),)
+    url(r'^__debug__/', include(debug_toolbar.urls)),
     # for the graphical browser/web console only, omissible
     url(r'json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"),
-
-
-    (r'^robots\.txt$', lambda r: HttpResponse(robots_file.read(), mimetype="text/plain")),
\ No newline at end of file
+    )
index bc900c6d7c39e4411986198dedd29bdbd6a5d94d..d2c898099101dc3b1c6ca6f05e2b045527eced8a 100644 (file)
@@ -708,12 +708,14 @@ class ItemViewMixin(ItemBaseMixin):
 
         return previous, next
 
-    def get_graphers(self):
+    def get_graphers(self, user):
         graphers = []
         for grapher in self.graphers:
             if grapher.id() == self.default_grapher_id:
                 graphers.insert(0, {'name':grapher.name(), 'id': grapher.id()})
-            else:
+            elif not hasattr(grapher, '_staging'):
+                graphers.append({'name':grapher.name(), 'id': grapher.id()})
+            elif not grapher._staging:
                 graphers.append({'name':grapher.name(), 'id': grapher.id()})
         return graphers
 
@@ -759,7 +761,7 @@ class ItemEditView(ItemViewMixin, UpdateWithInlinesView):
         #FIXME
         context['mime_type'] = 'audio/mp3'
         context['export_formats'] = self.get_export_formats()
-        context['visualizers'] = self.get_graphers()
+        context['visualizers'] = self.get_graphers(self.request.user)
         context['audio_export_enabled'] = self.export_enabled
         context['auto_zoom'] = True
         return context
@@ -815,7 +817,7 @@ class ItemCopyView(ItemAddView):
         #FIXME
         context['mime_type'] = 'audio/mp3'
         context['export_formats'] = self.get_export_formats()
-        context['visualizers'] = self.get_graphers()
+        context['visualizers'] = self.get_graphers(self.request.user)
         context['audio_export_enabled'] = self.export_enabled
         context['auto_zoom'] = True
         return context
@@ -957,7 +959,7 @@ class ItemDetailView(ItemViewMixin, DetailView):
 
         context['item'] = item
         context['export_formats'] = self.get_export_formats()
-        context['visualizers'] = self.get_graphers()
+        context['visualizers'] = self.get_graphers(self.request.user)
         context['auto_zoom'] = self.auto_zoom
         context['audio_export_enabled'] = self.export_enabled
         context['previous'] = previous