X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsupportview.py;h=bbb5b495f4a4b31a9f752b791849cdfc0f2b7b25;hb=d952e5a32d6fd2305bab65a9e8a6be66607c10df;hp=c16c89fdfaf1adfa017793a65f6996c86188fb0e;hpb=f0fea081b21d77ba379b23a9344881ecd2f37e59;p=myslice.git diff --git a/portal/supportview.py b/portal/supportview.py index c16c89fd..bbb5b495 100644 --- a/portal/supportview.py +++ b/portal/supportview.py @@ -8,7 +8,7 @@ from django.shortcuts import render from unfold.loginrequired import FreeAccessView -from manifold.manifoldresult import ManifoldResult +from manifoldapi.manifoldresult import ManifoldResult from ui.topmenu import topmenu_items, the_user from myslice.configengine import ConfigEngine @@ -17,19 +17,15 @@ from theme import ThemeView class SupportView (FreeAccessView, ThemeView): template_name = 'supportview.html' - # expose this so we can mention the backend URL on the welcome page - def default_env (self): - return { - 'MANIFOLD_URL':ConfigEngine().manifold_url(), - } + def post (self,request): - env = self.default_env() + env = {} env['theme'] = self.theme return render_to_response(self.template, env, context_instance=RequestContext(request)) def get (self, request, state=None): - env = self.default_env() + env = {} if request.user.is_authenticated(): env['person'] = self.request.user @@ -40,12 +36,10 @@ class SupportView (FreeAccessView, ThemeView): env['username']=the_user(request) - env['topmenu_items'] = topmenu_items(None, request) + if state: env['state'] = state elif not env['username']: env['state'] = None # use one or two columns for the layout - not logged in users will see the login prompt - env['layout_1_or_2']="layout-unfold2.html" if not env['username'] else "layout-unfold1.html" - - + return render_to_response(self.template, env, context_instance=RequestContext(request))