git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: getting iotlab_login in Tools tab
[myslice.git]
/
portal
/
homeview.py
diff --git
a/portal/homeview.py
b/portal/homeview.py
index
f1ac37c
..
1fe1d2a
100644
(file)
--- a/
portal/homeview.py
+++ b/
portal/homeview.py
@@
-17,9
+17,11
@@
from ui.topmenu import topmenu_items, the_user
from myslice.configengine import ConfigEngine
from myslice.theme import ThemeView
from myslice.configengine import ConfigEngine
from myslice.theme import ThemeView
+from portal.account import Account, get_expiration
from portal.models import PendingSlice
from portal.models import PendingSlice
+from portal.actions import authority_check_pis
-import json
+import json
, time
import activity.user
class HomeView (FreeAccessView, ThemeView):
import activity.user
class HomeView (FreeAccessView, ThemeView):
@@
-88,17
+90,23
@@
class HomeView (FreeAccessView, ThemeView):
acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
acc_user_cred = account_config.get('delegated_user_credential','N/A')
# assigning values
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"
+ #if acc_auth_cred=={} or acc_auth_cred=='N/A':
+ # pi = "is_not_pi"
+ #else:
+ # pi = "is_pi"
+ user_email = str(self.request.user)
+ pi = authority_check_pis(self.request, user_email)
# check if the user has creds or not
if acc_user_cred == {} or acc_user_cred == 'N/A':
user_cred = 'no_creds'
else:
# 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'
-
+ 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():
# list the pending slices of this user
pending_slices = []
for slices in PendingSlice.objects.filter(type_of_nodes__iexact=self.request.user).all():
@@
-151,16
+159,21
@@
class HomeView (FreeAccessView, ThemeView):
acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
acc_user_cred = account_config.get('delegated_user_credential','N/A')
# assigning values
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"
-
+ #if acc_auth_cred=={} or acc_auth_cred=='N/A':
+ # pi = "is_not_pi"
+ #else:
+ # pi = "is_pi"
+ user_email = str(self.request.user)
+ pi = authority_check_pis(self.request, user_email)
# check if the user has creds or not
if acc_user_cred == {} or acc_user_cred == 'N/A':
user_cred = 'no_creds'
else:
# 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'
+ 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 = []
# list the pending slices of this user
pending_slices = []