X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=1097570c4bdd21ebf1df5f1784b4c97bcd5d9f99;hb=13aebd01514329394c6663834c3dc473ddb969a6;hp=395cd965b04ef04230ab3ab01a03fa33b9f0f2d1;hpb=73c56c22ad3fad69695018c4dea8a0d22cd5727c;p=unfold.git

diff --git a/portal/homeview.py b/portal/homeview.py
index 395cd965..1097570c 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -8,11 +8,14 @@ from django.shortcuts import render
 
 from unfold.loginrequired import FreeAccessView
 
-from manifold.manifoldresult import ManifoldResult
+from manifold.core.query                import Query
+from manifoldapi.manifoldapi            import execute_query
+
+from manifoldapi.manifoldresult import ManifoldResult
 from ui.topmenu import topmenu_items, the_user
 from myslice.configengine import ConfigEngine
 
-from theme import ThemeView
+from myslice.theme import ThemeView
 
 class HomeView (FreeAccessView, ThemeView):
     template_name = 'home-view.html'
@@ -26,6 +29,8 @@ class HomeView (FreeAccessView, ThemeView):
     def post (self,request):
         env = self.default_env()
         env['theme'] = self.theme
+        env['section'] = "Dashboard"
+        
         username = request.POST.get('username')
         password = request.POST.get('password')
         
@@ -43,7 +48,6 @@ class HomeView (FreeAccessView, ThemeView):
             manifoldresult = auth_result
             # let's use ManifoldResult.__repr__
             env['state']="%s"%manifoldresult
-            env['layout_1_or_2']="layout-unfold2.html"
             
             return render_to_response(self.template,env, context_instance=RequestContext(request))
         # user was authenticated at the backend
@@ -55,6 +59,7 @@ class HomeView (FreeAccessView, ThemeView):
                 
                 if request.user.is_authenticated(): 
                     env['person'] = self.request.user
+                    env['username'] = self.request.user
                 else: 
                     env['person'] = None
                 return render_to_response(self.template,env, context_instance=RequestContext(request))
@@ -66,7 +71,6 @@ class HomeView (FreeAccessView, ThemeView):
         # otherwise
         else:
             env['state'] = "Your username and/or password were incorrect."
-            env['layout_1_or_2']="layout-unfold2.html"
             
             return render_to_response(self.template, env, context_instance=RequestContext(request))
 
@@ -77,17 +81,58 @@ class HomeView (FreeAccessView, ThemeView):
             env['person'] = self.request.user
         else: 
             env['person'] = None
-    
+
         env['theme'] = self.theme
-    
+        env['section'] = "Dashboard"
+
 
         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"
         
+#         account_query  = Query().get('local:account').select('user_id','platform_id','auth_type','config')
+#         account_details = execute_query(self.request, account_query)
+#         for account_detail in account_details:
+#             account_config = json.loads(account_detail['config'])
+#             platform_name = platform_detail['platform']
+#             if 'myslice' in platform_detail['platform']:
+#                 acc_user_cred = account_config.get('delegated_user_credential','N/A')
+#                 acc_slice_cred = account_config.get('delegated_slice_credentials','N/A')
+#                 acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
+# 
+#                 if 'N/A' not in acc_user_cred:
+#                     exp_date = re.search('<expires>(.*)</expires>', acc_user_cred)
+#                     if exp_date:
+#                         user_exp_date = exp_date.group(1)
+#                         user_cred_exp_list.append(user_exp_date)
+# 
+#                     my_users = [{'cred_exp': t[0]}
+#                         for t in zip(user_cred_exp_list)]
+#                
+# 
+#                 if 'N/A' not in acc_slice_cred:
+#                     for key, value in acc_slice_cred.iteritems():
+#                         slice_list.append(key)
+#                         # get cred_exp date
+#                         exp_date = re.search('<expires>(.*)</expires>', value)
+#                         if exp_date:
+#                             exp_date = exp_date.group(1)
+#                             slice_cred_exp_list.append(exp_date)
+# 
+#                     my_slices = [{'slice_name': t[0], 'cred_exp': t[1]}
+#                         for t in zip(slice_list, slice_cred_exp_list)]
+# 
+#                 if 'N/A' not in acc_auth_cred:
+#                     for key, value in acc_auth_cred.iteritems():
+#                         auth_list.append(key)
+#                         #get cred_exp date
+#                         exp_date = re.search('<expires>(.*)</expires>', value)
+#                         if exp_date:
+#                             exp_date = exp_date.group(1)
+#                             auth_cred_exp_list.append(exp_date)
+
         
         return render_to_response(self.template, env, context_instance=RequestContext(request))