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

Conflicts:
	rest/__init__.py

diff --git a/portal/templates/institution.html b/portal/templates/institution.html
index f2a53d5..6026b71 100644 (file)
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@ -92,7 +92,7 @@
             */
         });
         {% if person %}
-        $.getJSON("/rest/slice/", function( data ) {
+        $.post("/rest/slice/",{'filters':{'parent_authority':'ple.upmc'}}, function( data ) {
             var list_slices = [];
             var table_slices = [];
             /* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "user", "slice_urn", "slice_expires" */

diff --git a/portal/templates/onelab/onelab_home-view.html b/portal/templates/onelab/onelab_home-view.html
index b81d960..2855aee 100644 (file)
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@ -100,7 +100,7 @@
                });
                
                {% if person %}
-               $.getJSON("/rest/user/", function( data ) {
+        $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
                  var items = [];
                  $.each( data[0].slice, function( key, val ) {
                        items.push( "<li><a href=\"portal/slice/"+val.slice_hrn+"\">" + val.slice_hrn + "</a></li>" );

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)