From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 27 Feb 2014 10:44:36 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~279
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=de9cba4dc7bb98a579cf5df1f9900e9328544871;p=unfold.git

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

Conflicts:
	portal/templates/institution.html
---

de9cba4dc7bb98a579cf5df1f9900e9328544871
diff --cc portal/templates/institution.html
index e4003b4a,a0f65104..812b2e54
--- a/portal/templates/institution.html
+++ b/portal/templates/institution.html
@@@ -166,6 -123,6 +166,7 @@@
                  slice_row += "<td>"+slice_url+"</td>";
                  slice_row += "<td>"+nodes_length+"</td>";
                  slice_row += "<td>"+val.slice_expires+"</td>";
++                slice_row += "</tr>";
                  table_slices.push(slice_row);
                  
              });
@@@ -191,6 -150,6 +192,7 @@@
                  user_row += "<td>"+val.user_first_name+"</td>";
                  user_row += "<td>"+val.user_last_name+"</td>";
  				user_row += "<td>"+val.enabled+"</td>";
++                user_row += "</tr>";
                  table_users.push(user_row);
                  
              });