X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fonelab%2Fonelab_institution.html;h=4dcaf1b2d64a9cefb550ce0a81d51e337bdde905;hb=52a0b9984635eab3576e652a3a55c7bb15f564d6;hp=c8a668f1f299631d6c9afab9790559605313b938;hpb=43da604014833e14325c327a0ea60c04bf112526;p=unfold.git
diff --git a/portal/templates/onelab/onelab_institution.html b/portal/templates/onelab/onelab_institution.html
index c8a668f1..4dcaf1b2 100644
--- a/portal/templates/onelab/onelab_institution.html
+++ b/portal/templates/onelab/onelab_institution.html
@@ -39,9 +39,11 @@
+/- |
Email |
User hrn |
+
@@ -65,7 +67,7 @@
Users |
Url |
- Expiration |
+ Creation |
@@ -90,7 +92,7 @@ $(document).ready(function() {
{% if person %}
{% if user_details.parent_authority %}
- $.post("/rest/slice/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
+ $.post("/rest/slice/",{'fields':['slice_hrn','users','url','slice_date_created'],'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
var list_slices = [];
var table_slices = [];
/* "slice_hrn", "slice_description", "slice_type", "parent_authority", "created", "nodes", "slice_url", "slice_last_updated", "users", "slice_urn", "slice_expires" */
@@ -101,17 +103,16 @@ $(document).ready(function() {
}else{
nodes_length=val.nodes.length;
}
- console.log(val);
if(val.users=="undefined" || val.users==null){
users_length=0;
}else{
users_length=val.users.length;
}
- if(val.slice_url=="undefined" || val.slice_url==null){
+ if(val.url=="undefined" || val.url==null){
slice_url="";
}else{
- slice_url=""+val.slice_url+"";
+ slice_url=""+val.url+"";
}
slice_row = "";
@@ -120,7 +121,7 @@ $(document).ready(function() {
slice_row += ""+users_length+" | ";
slice_row += ""+slice_url+" | ";
//slice_row += ""+nodes_length+" | ";
- slice_row += ""+val.slice_expires+" | ";
+ slice_row += ""+val.slice_date_created+" | ";
slice_row += "
";
table_slices.push(slice_row);
@@ -133,7 +134,7 @@ $(document).ready(function() {
});
- $.post("/rest/user/",{'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
+ $.post("/rest/user/",{'fields':['user_hrn','user_email'],'filters':{'parent_authority':'{{user_details.parent_authority}}'}}, function( data ) {
var list_users = [];
var table_users = [];
/* Available fields
@@ -146,9 +147,11 @@ $(document).ready(function() {
user_row += " | ";
user_row += ""+val.user_email+" | ";
user_row += ""+val.user_hrn+" | ";
+ /*
user_row += ""+val.user_first_name+" | ";
user_row += ""+val.user_last_name+" | ";
user_row += ""+val.user_enabled+" | ";
+ */
user_row += "";
table_users.push(user_row);
});