From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 26 Feb 2014 18:34:15 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~284
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ff6408f68dcb6231d5ad7941dc7db3d9cd9fa6bb;p=myslice.git

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

Conflicts:
	rest/__init__.py
---

ff6408f68dcb6231d5ad7941dc7db3d9cd9fa6bb
diff --cc portal/templates/onelab/onelab_home-view.html
index b81d9604,b81d9604..2855aeed
--- a/portal/templates/onelab/onelab_home-view.html
+++ b/portal/templates/onelab/onelab_home-view.html
@@@ -100,7 -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>" );