ssh ple and iotlab updated in tools page

[myslice.git] / portal / homeview.py

diff --git a/portal/homeview.py b/portal/homeview.py
index bd7b2cd..00b279d 100644 (file)
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -69,24 +69,38 @@ class HomeView (FreeAccessView, ThemeView):
                     activity.user.login(self.request)
                     
                     ## 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')
                     platform_details = execute_query(self.request, platform_query)
                     account_details = execute_query(self.request, account_query)
-                    for platform_detail in platform_details:
-                        for account_detail in account_details:
-                            if platform_detail['platform_id'] == account_detail['platform_id']:
-                                if 'config' in account_detail and account_detail['config'] is not '':
-                                    account_config = json.loads(account_detail['config'])
-                                    if 'myslice' in platform_detail['platform']:
-                                        acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
+                    if platform_details is not None and platform_details != {}:
+                        for platform_detail in platform_details:
+                            for account_detail in account_details:
+                                if platform_detail['platform_id'] == account_detail['platform_id']:
+                                    if 'config' in account_detail and account_detail['config'] is not '':
+                                        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                
                 else: 
                     env['person'] = None
                 return render_to_response(self.template,env, context_instance=RequestContext(request))
@@ -109,15 +123,18 @@ 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
             platform_details = execute_query(self.request, platform_query)
             account_details = execute_query(self.request, account_query)
-            if platform_details is None:
-                env['person'] = None
-            else:
+            if platform_details is not None and platform_details != {}:
                 for platform_detail in platform_details:
                     for account_detail in account_details:
                         if 'platform_id' in platform_detail:
@@ -126,14 +143,23 @@ 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')
-                # assigning values
-                if acc_auth_cred=={} or acc_auth_cred=='N/A':
-                    pi = "is_not_pi"
-                else:
-                    pi = "is_pi"
-            
-                env['pi'] = pi 
-                env['person'] = self.request.user
+                                        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"
+
+            # 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