X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=0be0105c21e21bdaca5c0f37190002a846088000;hb=d4fc2d235475cfd6f536e7cd584aa8524d02b242;hp=a66cd36dff7b709f4c27e08d972d01ff790a96fb;hpb=0098d38aa259c2aeeac53c5fc0a91acefa8f0ee7;p=myslice.git

diff --git a/portal/homeview.py b/portal/homeview.py
index a66cd36d..0be0105c 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -6,14 +6,16 @@ from django.contrib.auth import authenticate, login, logout
 from django.template import RequestContext
 from django.shortcuts import render_to_response
 
-from myslice.viewutils import topmenu_items, the_user
+from manifold.manifoldresult import ManifoldResult
+from ui.topmenu import topmenu_items, the_user
 from myslice.config import Config
 
 class HomeView (View):
 
+    # expose this so we can mention the backend URL on the welcome page
     def default_env (self):
         return { 
-                 'manifold_url':Config.manifold_url,
+                 'MANIFOLD_URL':Config.manifold_url(),
                  }
 
     def post (self,request):
@@ -24,8 +26,20 @@ class HomeView (View):
         # pass request within the token, so manifold session key can be attached to the request session.
         token = {'username': username, 'password': password, 'request': request}    
 
-        user = authenticate(token=token)
-        if user is not None:
+        # our authenticate function returns either
+        # . a ManifoldResult - when something has gone wrong, like e.g. backend is unreachable
+        # . a django User in case of success
+        # . or None if the backend could be reached but the authentication failed
+        auth_result = authenticate(token=token)
+        # high-level errors, like connection refused or the like
+        if isinstance (auth_result, ManifoldResult):
+            manifoldresult = auth_result
+            # let's use ManifoldResult.__repr__
+            env['state']="%s"%manifoldresult
+            return render_to_response('home-view.html',env, context_instance=RequestContext(request))
+        # user was authenticated at the backend
+        elif auth_result is not None:
+            user=auth_result
             if user.is_active:
                 print "LOGGING IN"
                 login(request, user)
@@ -33,6 +47,7 @@ class HomeView (View):
             else:
                 env['state'] = "Your account is not active, please contact the site admin."
                 return render_to_response('home-view.html',env, context_instance=RequestContext(request))
+        # otherwise
         else:
             env['state'] = "Your username and/or password were incorrect."
             return render_to_response('home-view.html',env, context_instance=RequestContext(request))
@@ -41,7 +56,7 @@ class HomeView (View):
     def get (self, request, state=None):
         env = self.default_env()
         env['username']=the_user(request)
-        env['topmenu_items'] = topmenu_items('', request)
+        env['topmenu_items'] = topmenu_items(None, request)
         if state: env['state'] = state
         elif not env['username']: env['state'] = "Please sign in"
         return render_to_response('home-view.html',env, context_instance=RequestContext(request))