From fad524c7c37b127c59d60f5045c702777dcb20a9 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 22 Dec 2014 18:31:39 +0100 Subject: [PATCH] add timeside staging filter --- telemeta/urls.py | 6 ++---- telemeta/views/item.py | 12 +++++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/telemeta/urls.py b/telemeta/urls.py index 97654689..8c4a9ee5 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -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 + ) diff --git a/telemeta/views/item.py b/telemeta/views/item.py index bc900c6d..d2c89809 100644 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@ -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 -- 2.39.5