Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

[unfold.git] / portal / homeview.py

diff --git a/portal/homeview.py b/portal/homeview.py
index ec6012c..cf3fcba 100644 (file)
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -5,6 +5,7 @@ from django.contrib.auth import authenticate, login, logout, get_user_model
 from django.template import RequestContext
 from django.shortcuts import render_to_response
 from django.shortcuts import render
+
 import json
 
 from unfold.loginrequired import FreeAccessView
@@ -34,6 +35,8 @@ from myslice.theme import ThemeView
 # Edelberto LDAP authentication XXX
 import ldap
 
+#import activity.user
+
 class HomeView (FreeAccessView, ThemeView):
     template_name = 'home-view.html'
         
@@ -125,13 +128,17 @@ class HomeView (FreeAccessView, ThemeView):
                                                print "DEBUG: user NOT exists on MySlice DBs"
                                                
                                                cn              = result_set[0][0][1]['cn'][0] 
-                                               print cn
                                                sn              =  result_set[0][0][1]['sn'][0]
-                                               print sn
-                                                fname =  sn.split(' ')[0]
-                                                lname =  sn.split(' ')[1]
-                                                print fname
-                                                print lname
+
+                                                fname=None
+                                                lname=None
+
+                                                try:
+                                                    fname =  sn.split(' ')[0]
+                                                    lname =  sn.split(' ')[1]
+                                                except:
+                                                    fname = sn
+                                                    lname = ""
 
                                                #authority_hrn  =  'fibre' + '.' + username.split('@')[1] 
                                                authority_hrn   =  'fibre'
@@ -307,6 +314,8 @@ class HomeView (FreeAccessView, ThemeView):
                        return render_to_response(self.template,env, context_instance=RequestContext(request))
                # otherwise
         else:
+            # log user activity
+            #activity.user.login(self.request, "error")
             env['state'] = "Your username and/or password were incorrect."
             
             return render_to_response(self.template, env, context_instance=RequestContext(request))
@@ -315,7 +324,12 @@ class HomeView (FreeAccessView, ThemeView):
         env = self.default_env()
         acc_auth_cred={}
         if request.user.is_authenticated():
+           
             ## check user is pi or not
+            platform_details = {}
+            account_details = {}
+            acc_auth_cred = {}
+            acc_user_cred = {}
             platform_query  = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled')
             account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
             # XXX Something like an invalid session seems to make the execute fail sometimes, and thus gives an error on the main page
@@ -329,13 +343,22 @@ class HomeView (FreeAccessView, ThemeView):
                                 account_config = json.loads(account_detail['config'])
                                 if 'myslice' in platform_detail['platform']:
                                     acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
+                                    acc_user_cred = account_config.get('delegated_user_credential','N/A')
             # assigning values
             if acc_auth_cred=={} or acc_auth_cred=='N/A':
                 pi = "is_not_pi"
             else:
                 pi = "is_pi"
 
-            env['pi'] = pi     
+            # check if the user has creds or not
+            if acc_user_cred == {} or acc_user_cred == 'N/A':
+                user_cred = 'no_creds'
+            else:
+                user_cred = 'has_creds'
+           
+
+            env['pi'] = pi
+            env['user_cred'] = user_cred                
             env['person'] = self.request.user
         else: 
             env['person'] = None