X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fhomeview.py;h=3e9514f3aab3887693a9ddacab9eb47652e7b592;hb=95acb4a32b2a19bbf47e7f3f4de462e8f07e0327;hp=f1ac37ccacf007752ca077b3a8219c862fb9f385;hpb=109ed808530a69d0779c8a8d9fee34e6149f2bf7;p=unfold.git diff --git a/portal/homeview.py b/portal/homeview.py index f1ac37cc..3e9514f3 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -17,9 +17,10 @@ from ui.topmenu import topmenu_items, the_user from myslice.configengine import ConfigEngine from myslice.theme import ThemeView +from portal.account import Account, get_expiration from portal.models import PendingSlice -import json +import json, time import activity.user class HomeView (FreeAccessView, ThemeView): @@ -97,8 +98,12 @@ 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(): @@ -160,7 +165,11 @@ 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 = []