X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=3e9514f3aab3887693a9ddacab9eb47652e7b592;hb=79e2722a381b3d6d7e3d00fa0de95eeaa4503f24;hp=00b279d2a907ac1b02f4abdb1226c2cdcab87fed;hpb=8a25cdc6e98ebc42bc57d9025ba6590b486c3737;p=unfold.git

diff --git a/portal/homeview.py b/portal/homeview.py
index 00b279d2..3e9514f3 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -1,24 +1,26 @@
 # this somehow is not used anymore - should it not be ?
-from django.core.context_processors import csrf
-from django.http import HttpResponseRedirect
-from django.contrib.auth import authenticate, login, logout
-from django.template import RequestContext
-from django.shortcuts import render_to_response
-from django.shortcuts import render
+from django.core.context_processors     import csrf
+from django.http                        import HttpResponseRedirect
+from django.contrib.auth                import authenticate, login, logout
+from django.template                    import RequestContext
+from django.shortcuts                   import render_to_response
+from django.shortcuts                   import render
 
-import json
 
-from unfold.loginrequired import FreeAccessView
+from unfold.loginrequired               import FreeAccessView
 
 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 manifoldapi.manifoldresult         import ManifoldResult
+from ui.topmenu                         import topmenu_items, the_user
+from myslice.configengine               import ConfigEngine
 
-from myslice.theme import ThemeView
+from myslice.theme                      import ThemeView
+from portal.account                     import Account, get_expiration
+from portal.models                      import PendingSlice
 
+import json, time
 import activity.user
 
 class HomeView (FreeAccessView, ThemeView):
@@ -96,9 +98,18 @@ class HomeView (FreeAccessView, ThemeView):
                     if acc_user_cred == {} or acc_user_cred == 'N/A':
                         user_cred = 'no_creds'
                     else:
-                        user_cred = 'has_creds'
-
-
+                        exp_date = get_expiration(acc_user_cred, 'timestamp')
+                        if exp_date < time.time():
+                            user_cred = 'creds_expired'
+                        else:
+                            user_cred = 'has_creds'
+
+                    # list the pending slices of this user
+                    pending_slices = []
+                    for slices in PendingSlice.objects.filter(type_of_nodes__iexact=self.request.user).all():
+                        pending_slices.append(slices.slice_name)
+
+                    env['pending_slices'] = pending_slices
                     env['pi'] = pi
                     env['user_cred'] = user_cred                
                 else: 
@@ -154,9 +165,18 @@ class HomeView (FreeAccessView, ThemeView):
             if acc_user_cred == {} or acc_user_cred == 'N/A':
                 user_cred = 'no_creds'
             else:
-                user_cred = 'has_creds'
-           
-
+                exp_date = get_expiration(acc_user_cred, 'timestamp')
+                if exp_date < time.time():
+                    user_cred = 'creds_expired'
+                else:
+                    user_cred = 'has_creds'
+
+            # list the pending slices of this user
+            pending_slices = []
+            for slices in PendingSlice.objects.filter(type_of_nodes__iexact=self.request.user).all():
+                pending_slices.append(slices.slice_name)
+        
+            env['pending_slices'] = pending_slices
             env['pi'] = pi
             env['user_cred'] = user_cred                
             env['person'] = self.request.user