Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
	portal/templates/base.html

diff --git a/portal/accountview.py b/portal/accountview.py
index 4d25c61..5b9c0d8 100644 (file)
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -1,7 +1,5 @@
 from unfold.loginrequired               import LoginRequiredAutoLogoutView
 #
-from sfa.trust.credential               import Credential
-from sfa.trust.certificate              import Keypair
 #
 from manifold.core.query                import Query
 from manifoldapi.manifoldapi            import execute_query
@@ -271,6 +269,9 @@ def get_myslice_account(request):
 @login_required
 #my_acc form value processing
 def account_process(request):
+    from sfa.trust.credential               import Credential
+    from sfa.trust.certificate              import Keypair
+
     user_query  = Query().get('local:user').select('user_id','email','password','config')
     user_details = execute_query(request, user_query)
     

diff --git a/portal/emailactivationview.py b/portal/emailactivationview.py
index 533cccf..4424c2e 100644 (file)
--- a/portal/emailactivationview.py
+++ b/portal/emailactivationview.py
@@ -29,12 +29,16 @@ class ActivateEmailView(FreeAccessView, ThemeView):
         if pending_authorities:
             return False                        
         pending_user_email = pending_user.email
-        query = Query.get('myplcuser').filter_by('email', '==', pending_user_email).select('enabled')
-        results = execute_admin_query(self.request, query)
-        for result in results:
-            # User is enabled in PLE
-            if 'enabled' in result and result['enabled']==True:
-                return True
+        try:
+            query = Query.get('myplcuser').filter_by('email', '==', pending_user_email).select('enabled')
+            results = execute_admin_query(self.request, query)
+            for result in results:
+                # User is enabled in PLE
+                if 'enabled' in result and result['enabled']==True:
+                    return True
+        except Exception, e:
+            print "Exception in myplc query = ",e
+
         return False
 
     def dispatch(self, *args, **kwargs):

diff --git a/portal/institution.py b/portal/institution.py
index 6dd1b20..ccdb625 100644 (file)
--- a/portal/institution.py
+++ b/portal/institution.py
@@ -35,7 +35,7 @@ class InstitutionView (LoginRequiredAutoLogoutView, ThemeView):
 
         if request.user.is_authenticated(): 
             env['person'] = self.request.user
-            user_query  = Query().get('user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn')
+            user_query  = Query().get('myslice:user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn')
             user_details = execute_query(self.request, user_query)
             try:
                 env['user_details'] = user_details[0]

diff --git a/portal/managementtababout.py b/portal/managementtababout.py
index 8bd1cdc..10da9c6 100644 (file)
--- a/portal/managementtababout.py
+++ b/portal/managementtababout.py
@@ -22,9 +22,6 @@ class ManagementAboutView (FreeAccessView, ThemeView):
     def get (self, request):
         
         if request.user.is_authenticated(): 
-            user_query  = Query().get('user').select('user_hrn','parent_authority').filter_by('user_hrn','==','$user_hrn')
-            user_details = execute_query(self.request, user_query)
-            
             user_local_query  = Query().get('local:user').select('config').filter_by('email','==',str(self.request.user))
             user_local_details = execute_query(self.request, user_local_query)
             user_authority = json.loads(user_local_details[0]['config']).get('authority')

diff --git a/portal/managementtabrequests.py b/portal/managementtabrequests.py
index 7c0b222..dcbe8a0 100644 (file)
--- a/portal/managementtabrequests.py
+++ b/portal/managementtabrequests.py
@@ -87,7 +87,7 @@ class ManagementRequestsView (LoginRequiredView, ThemeView):
 
             # ** Where am I a PI **
             # For this we need to ask SFA (of all authorities) = PI function
-            pi_authorities_query = Query.get('user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
+            pi_authorities_query = Query.get('myslice:user').filter_by('user_hrn', '==', '$user_hrn').select('pi_authorities')
             pi_authorities_tmp = execute_query(self.request, pi_authorities_query)
             pi_authorities = set()
             try:

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index e6683bd..4a52560 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -126,7 +126,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView):
             slice_name = slice_request['slice_name']
             req_slice_hrn = authority_hrn + '.' + slice_name
             # comparing requested slice_hrn with the existing slice_hrn 
-            slice_query  = Query().get('slice').select('slice_hrn','parent_authority').filter_by('parent_authority','==',authority_hrn)
+            slice_query  = Query().get('myslice:slice').select('slice_hrn','parent_authority').filter_by('parent_authority','==',authority_hrn)
             slice_details_sfa = execute_admin_query(wsgi_request, slice_query)
             for _slice in slice_details_sfa:
                 if _slice['slice_hrn'] == req_slice_hrn:

diff --git a/portal/templates/base.html b/portal/templates/base.html
index cc60f7f..0bf9ab4 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -52,7 +52,7 @@ $(document).ready(function() {
     myslice.login();
 
     user = myslice.user();
-    
+
     var slices = [];
     if($.isEmptyObject(user)){
         $.post("/rest/myslice:user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
@@ -69,7 +69,7 @@ $(document).ready(function() {
         slices = user.slices;
         drawSlices(slices);
     }
-
+   
     /*
         Launch queries to get the resources and leases in Manifold Cache
     */

diff --git a/portal/templates/fed4fire/fed4fire_institution.html b/portal/templates/fed4fire/fed4fire_institution.html
index bd361de..8e2afbb 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_institution.html
+++ b/portal/templates/fed4fire/fed4fire_institution.html
@@ -92,7 +92,7 @@ $(document).ready(function() {
     {% if person %}
     {% if user_details.parent_authority %}
 
-        $.post("/rest/slice/",{'fields':['slice_hrn','users','url','slice_date_created'],'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
+        $.post("/rest/myslice:slice/",{'fields':['slice_hrn','users','url','slice_date_created'],'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
             var list_slices = [];
             var table_slices = [];
             /* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "users", "slice_urn", "slice_expires" */

diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index c627e5b..e2a95ca 100644 (file)
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -97,7 +97,7 @@ $(document).ready(function() {
             $("div#authority-tab-loading").css("display","none");
          });
 
-        $.post("/rest/slice/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
+        $.post("/rest/myslice:slice/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
             var list_slices = [];
             var table_slices = [];
             /* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "users", "slice_urn", "slice_expires" */