From 4575bfd54a282e47ca302e1348a93391a1915bc0 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 16 Dec 2013 21:18:51 +0100 Subject: [PATCH] use topmenu_items_live in all pages that have a page instance --- portal/platformsview.py | 4 ++-- portal/platformview.py | 4 ++-- portal/registrationview.py | 4 ++-- portal/resourceview.py | 4 ++-- portal/views.py | 4 ++-- sample/dashboardview.py | 4 ++-- sample/pluginview.py | 4 ++-- sample/querygridview.py | 4 ++-- sample/querytableview.py | 4 ++-- sandbox/views.py | 6 +++--- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/portal/platformsview.py b/portal/platformsview.py index fee73976..7e7d53a4 100644 --- a/portal/platformsview.py +++ b/portal/platformsview.py @@ -2,7 +2,7 @@ from manifold.core.query import Query from unfold.page import Page from unfold.loginrequired import FreeAccessView -from ui.topmenu import topmenu_items, the_user +from ui.topmenu import topmenu_items_live, the_user from plugins.querytable import QueryTable @@ -41,7 +41,7 @@ class PlatformsView(FreeAccessView): # more general variables expected in the template context['title'] = 'Platforms connected to MySlice' # the menu items on the top - context['topmenu_items'] = topmenu_items('Platforms', self.request) + context['topmenu_items'] = topmenu_items_live('Platforms', page) # so we can sho who is logged context['username'] = the_user(self.request) diff --git a/portal/platformview.py b/portal/platformview.py index f852daa9..86d282b4 100644 --- a/portal/platformview.py +++ b/portal/platformview.py @@ -2,7 +2,7 @@ from manifold.core.query import Query from unfold.page import Page from unfold.loginrequired import FreeAccessView -from ui.topmenu import topmenu_items, the_user +from ui.topmenu import topmenu_items_live, the_user from plugins.querytable import QueryTable @@ -53,7 +53,7 @@ class PlatformView(FreeAccessView): # more general variables expected in the template context['title'] = 'Platforms connected to MySlice' # the menu items on the top - context['topmenu_items'] = topmenu_items('Platforms', self.request) + context['topmenu_items'] = topmenu_items_live('Platforms', page) # so we can sho who is logged context['username'] = the_user(self.request) diff --git a/portal/registrationview.py b/portal/registrationview.py index 8f91de79..0002bf4e 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -9,7 +9,7 @@ from django.shortcuts import render from unfold.page import Page from unfold.loginrequired import FreeAccessView -from ui.topmenu import topmenu_items +from ui.topmenu import topmenu_items_live from manifold.manifoldapi import execute_admin_query from manifold.core.query import Query @@ -168,7 +168,7 @@ class RegistrationView (FreeAccessView): return render(request, 'user_register_complete.html') template_env = { - 'topmenu_items': topmenu_items('Register', request), + 'topmenu_items': topmenu_items_live('Register', page), 'errors': errors, 'firstname': request.POST.get('firstname', ''), 'lastname': request.POST.get('lastname', ''), diff --git a/portal/resourceview.py b/portal/resourceview.py index c4d6e28c..3ed9dcca 100644 --- a/portal/resourceview.py +++ b/portal/resourceview.py @@ -2,7 +2,7 @@ from manifold.core.query import Query from unfold.page import Page from unfold.loginrequired import FreeAccessView -from ui.topmenu import topmenu_items, the_user +from ui.topmenu import topmenu_items_live, the_user from plugins.googlemap import GoogleMap from plugins.querytable import QueryTable @@ -85,7 +85,7 @@ class ResourceView(FreeAccessView): # more general variables expected in the template context['title'] = 'Information about a resource' # the menu items on the top - context['topmenu_items'] = topmenu_items(None, self.request) + context['topmenu_items'] = topmenu_items_live(None, page) # so we can sho who is logged context['username'] = the_user(self.request) diff --git a/portal/views.py b/portal/views.py index d454502e..3a719074 100644 --- a/portal/views.py +++ b/portal/views.py @@ -28,7 +28,7 @@ from django.shortcuts import render from django.template.loader import render_to_string from unfold.loginrequired import FreeAccessView -from ui.topmenu import topmenu_items, the_user +from ui.topmenu import topmenu_items_live, the_user from portal.event import Event # presview is put in observation for now @@ -68,7 +68,7 @@ class PresViewView(FreeAccessView): # more general variables expected in the template context['title'] = 'Test view that combines various plugins' # the menu items on the top - context['topmenu_items'] = topmenu_items('PresView', self.request) + context['topmenu_items'] = topmenu_items_live('PresView', page) # so we can sho who is logged context['username'] = the_user(self.request) diff --git a/sample/dashboardview.py b/sample/dashboardview.py index 947c79d4..18438d82 100644 --- a/sample/dashboardview.py +++ b/sample/dashboardview.py @@ -19,7 +19,7 @@ from plugins.quickfilter import QuickFilter from trash.trashutils import quickfilter_criterias # -from ui.topmenu import topmenu_items, the_user +from ui.topmenu import topmenu_items_live, the_user @login_required def dashboard_view (request): @@ -71,7 +71,7 @@ def dashboard_view (request): # more general variables expected in the template template_env [ 'title' ] = 'Test view for a full request cycle' # the menu items on the top - template_env [ 'topmenu_items' ] = topmenu_items('dashboard', request) + template_env [ 'topmenu_items' ] = topmenu_items_live('dashboard', page) # so we can sho who is logged template_env [ 'username' ] = the_user (request) diff --git a/sample/pluginview.py b/sample/pluginview.py index 85441bfb..144115e9 100644 --- a/sample/pluginview.py +++ b/sample/pluginview.py @@ -19,7 +19,7 @@ from plugins.raw import Raw from plugins.messages import Messages from plugins.querytable import QueryTable -from ui.topmenu import topmenu_items, the_user +from ui.topmenu import topmenu_items_live, the_user from trash.trashutils import hard_wired_slice_names, hard_wired_list, lorem_p, lorem, quickfilter_criterias #might be useful or not depending on the context @@ -89,7 +89,7 @@ $(function(){$("#bouton").click(issue_debug);}); # more general variables expected in the template template_env [ 'title' ] = 'Single Plugin View' - template_env [ 'topmenu_items' ] = topmenu_items('plugin', request) + template_env [ 'topmenu_items' ] = topmenu_items_live('plugin', page) template_env [ 'username' ] = the_user (request) # the prelude object in page contains a summary of the requirements() for all plugins diff --git a/sample/querygridview.py b/sample/querygridview.py index 1b2a16bb..0e2fc8ea 100644 --- a/sample/querygridview.py +++ b/sample/querygridview.py @@ -7,7 +7,7 @@ from manifold.core.query import Query, AnalyzedQuery from unfold.page import Page -from ui.topmenu import topmenu_items, the_user +from ui.topmenu import topmenu_items_live, the_user from plugins.querygrid import QueryGrid @@ -69,7 +69,7 @@ class QueryGridView (TemplateView): # more general variables expected in the template template_env [ 'title' ] = 'simple %(slicename)s'%locals() # the menu items on the top - template_env [ 'topmenu_items' ] = topmenu_items('Slice', request) + template_env [ 'topmenu_items' ] = topmenu_items_live('Slice', page) # so we can sho who is logged template_env [ 'username' ] = the_user (request) diff --git a/sample/querytableview.py b/sample/querytableview.py index 4b667aac..25cb6a05 100644 --- a/sample/querytableview.py +++ b/sample/querytableview.py @@ -7,7 +7,7 @@ from manifold.core.query import Query, AnalyzedQuery from unfold.page import Page -from ui.topmenu import topmenu_items, the_user +from ui.topmenu import topmenu_items_live, the_user from plugins.querytable import QueryTable @@ -68,7 +68,7 @@ class QueryTableView (TemplateView): # more general variables expected in the template template_env [ 'title' ] = 'simple %(slicename)s'%locals() # the menu items on the top - template_env [ 'topmenu_items' ] = topmenu_items('Slice', request) + template_env [ 'topmenu_items' ] = topmenu_items_live('Slice', page) # so we can sho who is logged template_env [ 'username' ] = the_user (request) diff --git a/sandbox/views.py b/sandbox/views.py index 707e8f73..6e1e1525 100644 --- a/sandbox/views.py +++ b/sandbox/views.py @@ -29,7 +29,7 @@ from django.template.loader import render_to_string from manifold.core.query import Query from plugins.myplugin import MyPlugin from plugins.maddash import MadDash -from ui.topmenu import topmenu_items, the_user +from ui.topmenu import topmenu_items_live, the_user from unfold.loginrequired import FreeAccessView from unfold.page import Page @@ -52,7 +52,7 @@ class MyPluginView(FreeAccessView): # more general variables expected in the template context['title'] = 'Sandbox for MyPlugin plugin' # the menu items on the top - context['topmenu_items'] = topmenu_items('myplugin', self.request) + context['topmenu_items'] = topmenu_items_live('myplugin', page) # so we can sho who is logged context['username'] = the_user(self.request) @@ -85,7 +85,7 @@ class MadDashView(FreeAccessView): context = super(MadDashView, self).get_context_data(**kwargs) context['unfold_main'] = plugin.render(self.request) context['title'] = 'Sandbox for MadDash plugin' - context['topmenu_items'] = topmenu_items('maddash', self.request) + context['topmenu_items'] = topmenu_items_live ('maddash', page) context['username'] = the_user(self.request) prelude_env = page.prelude_env() -- 2.43.0