From: Loic Baron Date: Thu, 10 Dec 2015 16:35:47 +0000 (+0100) Subject: Merge branch 'onelab' of https://github.com/onelab-eu/myslice into onelab X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=65f3afecca7801020377406f5b3daf9f495a8b94;hp=0300e4a519eb44fa1e2b769f1c871471ebfe0620;p=unfold.git Merge branch 'onelab' of https://github.com/onelab-eu/myslice into onelab --- diff --git a/portal/templates/slice-tab-cloud.html b/portal/templates/slice-tab-cloud.html index c92b416b..247da1ba 100644 --- a/portal/templates/slice-tab-cloud.html +++ b/portal/templates/slice-tab-cloud.html @@ -401,7 +401,11 @@ function render_node(platform, node, state){ if(sliver instanceof Array){ client_id = sliver['@name']; }else{ - client_id = node['@client_id']; + if ('@sliver_name' in sliver){ + client_id = sliver['@sliver_name']; + }else{ + client_id = node['@client_id']; + } } if ('@component_name' in node){ node_name = node['@component_name'] @@ -417,10 +421,10 @@ function render_node(platform, node, state){ if(state=='pending_add'){ $("#"+id).append("
"); }else{ - $("#"+id).append("
 
"); + $("#"+id).append("
 
"); } - $("#"+id).append("
"+node_name+"
"); - $("#"+id).append("
"+client_id+"
"); + $("#"+id).append("
"+node_name+"
"); + $("#"+id).append("
"+client_id+"
"); if('openstack:flavor' in node[key_sliver]){ $("#"+id).append("
"+sliver['openstack:flavor']['@name']+"
"); $("#"+id).append("
"+sliver['openstack:flavor']['openstack:image']['@name']+"
"); @@ -561,7 +565,7 @@ $(document).ready(function() {

{{ platform }}

// display only if VMs already in slice

VMs in slice {{slicename}}

-