git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
09510a6
b809db2
)
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
author
Loic Baron
<loic.baron@lip6.fr>
Wed, 26 Feb 2014 18:34:15 +0000
(19:34 +0100)
committer
Loic Baron
<loic.baron@lip6.fr>
Wed, 26 Feb 2014 18:34:15 +0000
(19:34 +0100)
Conflicts:
rest/__init__.py
1
2
portal/templates/institution.html
patch
|
diff1
|
diff2
|
blob
|
history
portal/templates/onelab/onelab_home-view.html
patch
|
diff1
|
diff2
|
blob
|
history
rest/__init__.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
portal/templates/institution.html
Simple merge
diff --cc
portal/templates/onelab/onelab_home-view.html
index
b81d960
,
b81d960
..
2855aee
---
1
/
portal/templates/onelab/onelab_home-view.html
---
2
/
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>" );
diff --cc
rest/__init__.py
Simple merge