1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00

Bug #4675: Fix vlan_id for vcenter network import

(cherry picked from commit f3a7b9f3c5e684994c6beb4084e42c8cab12fa3c)
This commit is contained in:
Carlos Martín 2016-07-22 15:21:04 +02:00
parent 03add2e601
commit 313f1f7e39
2 changed files with 5 additions and 3 deletions

View File

@ -302,8 +302,10 @@ define(function(require) {
network_tmpl += ar_array.join(",\n")
network_tmpl += "]"
if ($(".vlaninfo", network_context)) {
network_tmpl += "VLAN_ID=" + $(".vlaninfo", network_context).val() + "\n";
var vlaninfo = $(".vlaninfo", network_context).text();
if ( vlaninfo != undefined && vlaninfo != "" ) {
network_tmpl += "\nVLAN_ID=" + vlaninfo + "\n";
}
var vnet_json = {

View File

@ -24,7 +24,7 @@
</a>
{{data.name}}
- <i>{{data.type}}</i>
{{#if data.vlan}} - <i>VLAN: {{data.vlan}}</i>{{/if}}
{{#if data.vlan}} - <i>VLAN: <span class="vlaninfo">{{data.vlan}}</span></i>{{/if}}
</label>
</li>
</ul>