From: Thierry Parmentelat Date: Wed, 4 Sep 2013 08:04:33 +0000 (+0200) Subject: move over imports for logout_on_manifold_exception X-Git-Tag: myslice-0.2-1~24^2~2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=f80330db2c8f4fe168dc45fc38165b9410f8230a;p=unfold.git move over imports for logout_on_manifold_exception --- diff --git a/myslice/viewutils.py b/myslice/viewutils.py index 3fa8ceba..cb1b31b9 100644 --- a/myslice/viewutils.py +++ b/myslice/viewutils.py @@ -1,5 +1,9 @@ # a set of utilities to help make the global layout consistent across views +from django.http import HttpResponseRedirect + +from manifold.manifoldresult import ManifoldException + def topmenu_items (current,request=None): has_user=request.user.is_authenticated() result=[] diff --git a/portal/sliceview.py b/portal/sliceview.py index 5bf37fb0..a7003d74 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -3,7 +3,6 @@ from django.template import RequestContext from django.shortcuts import render_to_response from django.contrib.auth.decorators import login_required -from django.http import HttpResponseRedirect from unfold.page import Page from manifold.core.query import Query, AnalyzedQuery @@ -264,7 +263,7 @@ def slice_view (request, slicename=tmp_default_slice): template_env [ 'unfold1_main' ] = main_plugin.render(request) # more general variables expected in the template - template_env [ 'title' ] = '%(slicename)s (test view that combines various plugins)'%locals() + template_env [ 'title' ] = '%(slicename)s'%locals() # the menu items on the top template_env [ 'topmenu_items' ] = topmenu_items('Slice', request) # so we can sho who is logged