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

[myslice.git] / rest / __init__.py

diff --git a/rest/__init__.py b/rest/__init__.py
index 636f1e5..3f25d77 100644 (file)
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -79,7 +79,7 @@ def platform(request, object_name, object_properties, object_filters = None):
 
 # Add different filters possibilities [['user.user_hrn','==','$user_hrn'],['parent_authority','==','ple.upmc']]
 def slice(request, object_name, object_properties, object_filters = None):
-    query = Query().get('slice').filter_by('user.user_hrn', '==', '$user_hrn')
+    query = Query().get('slice')#.filter_by('user.user_hrn', '==', '$user_hrn')
     if object_filters :
         for k, f in object_filters.iteritems() :
             query.filter_by(k, '==', f)
@@ -95,9 +95,7 @@ def resource(request, object_name, object_properties, object_filters = None):
     return send(request, execute_query(request, query), object_properties)
 
 def user(request, object_name, object_properties, object_filters = None):
-#    query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn').select(object_properties)
-    query = Query().get('user').filter_by('parent_authority', '==', 'ple.upmc').select(object_properties)
-    #query = Query().get('user').filter_by('user_hrn', '==', '$user_hrn')
+    query = Query().get('user')#.filter_by('user_hrn', '==', '$user_hrn')
     if object_filters :
         for k, f in object_filters.iteritems() :
             query.filter_by(k, '==', f)