From: Loic Baron <loic.baron@lip6.fr>
Date: Mon, 16 Dec 2013 10:14:47 +0000 (+0100)
Subject: disabled queries to an explicit platform using prefix
X-Git-Tag: myslice-0.3-0~70
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=40d3a628db015a26949f11fddafba05a47730017

disabled queries to an explicit platform using prefix
---

diff --git a/portal/dashboardview.py b/portal/dashboardview.py
index 65826bd0..41177823 100644
--- a/portal/dashboardview.py
+++ b/portal/dashboardview.py
@@ -34,19 +34,19 @@ class DashboardView (LoginRequiredAutoLogoutView):
 
         # not always found in user_details...
         config={}
-        for user_detail in user_details:
-            #email = user_detail['email']
-            if user_detail['config']:
-                config = json.loads(user_detail['config'])
-        user_detail['authority'] = config.get('authority',"Unknown Authority")
-
-        print user_detail
-        if user_detail['authority'] is not None:
-            sub_authority = user_detail['authority'].split('.')
-            root_authority = sub_authority[0]
-            slice_query = Query().get(root_authority+':user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
-        else:
-            slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
+  #      for user_detail in user_details:
+  #          #email = user_detail['email']
+  #          if user_detail['config']:
+  #              config = json.loads(user_detail['config'])
+  #      user_detail['authority'] = config.get('authority',"Unknown Authority")
+#
+#        print user_detail
+#        if user_detail['authority'] is not None:
+#            sub_authority = user_detail['authority'].split('.')
+#            root_authority = sub_authority[0]
+#            slice_query = Query().get(root_authority+':user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
+#        else:
+        slice_query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select('user_hrn', 'slice.slice_hrn')
         page.enqueue_query(slice_query)
         page.enqueue_query(testbed_query)
 
diff --git a/portal/sliceview.py b/portal/sliceview.py
index 8e103a1f..ff4cc5e5 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -35,8 +35,8 @@ from myslice.config                  import Config
 tmp_default_slice='ple.upmc.myslicedemo'
 
 # temporary : turn off the users part to speed things up
-do_query_users=True
-#do_query_users=False
+#do_query_users=True
+do_query_users=False
 
 #do_query_leases=True
 do_query_leases=False
@@ -97,24 +97,24 @@ class SliceView (LoginRequiredAutoLogoutView):
             
             # not always found in user_details...
             config={}
-            for user_detail in user_details:
-                #email = user_detail['email']
-                if user_detail['config']:
-                    config = json.loads(user_detail['config'])
-            user_detail['authority'] = config.get('authority',"Unknown Authority")
-
-            if user_detail['authority'] is not None:
-                sub_authority = user_detail['authority'].split('.')
-                root_authority = sub_authority[0]
-                query_user_all = Query.get(root_authority+':user').select(user_fields)
-
-                # XXX TODO this filter doesn't work - to be improved in Manifold
-                #.filter_by('authority.authority_hrn', '=', user_detail['authority'])
-
-                page.enqueue_query(query_user_all)
-            else:
-                print "authority of the user is not in local:user db"
-                query_user_all = Query.get('user').select(user_fields)
+#            for user_detail in user_details:
+#                #email = user_detail['email']
+#                if user_detail['config']:
+#                    config = json.loads(user_detail['config'])
+#            user_detail['authority'] = config.get('authority',"Unknown Authority")
+#
+#            if user_detail['authority'] is not None:
+#                sub_authority = user_detail['authority'].split('.')
+#                root_authority = sub_authority[0]
+#                query_user_all = Query.get(root_authority+':user').select(user_fields)
+#
+#                # XXX TODO this filter doesn't work - to be improved in Manifold
+#                #.filter_by('authority.authority_hrn', '=', user_detail['authority'])
+#
+#                page.enqueue_query(query_user_all)
+#            else:
+#                print "authority of the user is not in local:user db"
+            query_user_all = Query.get('user').select(user_fields)
             #    query_user_all = None
     
         # ... and for the relations