From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 24 Apr 2015 12:12:32 +0000 (+0200)
Subject: Dashboard: hide No Creds msg while fetching projects & slices, display only if it... 
X-Git-Tag: myslice-1.3~13
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=9923754657b1e28fab15ac658f500f4c6b90b751

Dashboard: hide No Creds msg while fetching projects & slices, display only if it fails
---

diff --git a/portal/homeview.py b/portal/homeview.py
index 44bcf70b..b417e094 100644
--- a/portal/homeview.py
+++ b/portal/homeview.py
@@ -86,7 +86,7 @@ class HomeView (FreeAccessView, ThemeView):
                         #else:
                         #    pi = "is_pi"
                         user_email = str(self.request.user)
-                        pi = authority_check_pis(self.request, user_email)
+                        #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':
@@ -104,7 +104,7 @@ class HomeView (FreeAccessView, ThemeView):
                             pending_slices.append(slices.slice_name)
 
                         env['pending_slices'] = pending_slices
-                        env['pi'] = pi
+                        #env['pi'] = pi
                         env['user_cred'] = user_cred
                     except Exception as e:
                         print e
@@ -168,7 +168,7 @@ class HomeView (FreeAccessView, ThemeView):
                 #else:
                 #    pi = "is_pi"
                 user_email = str(self.request.user)
-                pi = authority_check_pis(self.request, user_email)
+                #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'
@@ -185,7 +185,7 @@ class HomeView (FreeAccessView, ThemeView):
                     pending_slices.append(slices.slice_name)
 
                 env['pending_slices'] = pending_slices
-                env['pi'] = pi
+                #env['pi'] = pi
                 env['user_cred'] = user_cred
                 env['person'] = self.request.user
             else:
diff --git a/portal/static/js/myslice.js b/portal/static/js/myslice.js
index ba3512c2..d97d6b08 100644
--- a/portal/static/js/myslice.js
+++ b/portal/static/js/myslice.js
@@ -200,9 +200,12 @@ var myslice = {
                     if(isFunction(fn)){
                         fn();
                     }
+                }else{
+                    $('#credentials_msg').css('display','block');
                 }
 		    });
         }else{
+            $('#credentials_msg').css('display','block');
             if(isFunction(fn)){
                 fn();
             }
diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index 09d90ca1..1f14b1db 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -14,7 +14,7 @@
 {% widget "_widget-no_credentials.html" %}
 <div class="container dashboard">
 	<div class="row">
-	    <div class="col-md-12">
+	    <div class="col-md-12" id="credentials_msg" style="display:none;">
 	{%if 'no_creds'  in user_cred %}
       	<p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">NO CREDENTIALS</a> are delegated to the portal!</p>
   	{%endif%}
diff --git a/rest/cache.py b/rest/cache.py
index 39439469..e9348187 100644
--- a/rest/cache.py
+++ b/rest/cache.py
@@ -9,7 +9,7 @@ import json
 def dispatch(request, action):
     
     if (action == 'clear') :
-        query = Query.update('myslice:user').filter_by('user_hrn', '==', '$user_hrn').set({'user_email':str(request.user)})
+        query = Query.update('myslice:user').filter_by('user_hrn', '==', '$user_hrn').set({'user_email':str(request.user)}).select('user_hrn')
         try:
             res = execute_query(request, query)
         except Exception, e: