From 313f1f7e390382a19609dbb9f9746e5d7b1de7dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 22 Jul 2016 15:21:04 +0200
Subject: [PATCH] Bug #4675: Fix vlan_id for vcenter network import

(cherry picked from commit f3a7b9f3c5e684994c6beb4084e42c8cab12fa3c)
---
 src/sunstone/public/app/utils/vcenter/networks.js      | 6 ++++--
 src/sunstone/public/app/utils/vcenter/networks/row.hbs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/sunstone/public/app/utils/vcenter/networks.js b/src/sunstone/public/app/utils/vcenter/networks.js
index c98001dda1..3d7d770599 100644
--- a/src/sunstone/public/app/utils/vcenter/networks.js
+++ b/src/sunstone/public/app/utils/vcenter/networks.js
@@ -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 = {
diff --git a/src/sunstone/public/app/utils/vcenter/networks/row.hbs b/src/sunstone/public/app/utils/vcenter/networks/row.hbs
index a43268ffe8..0ee94f6b02 100644
--- a/src/sunstone/public/app/utils/vcenter/networks/row.hbs
+++ b/src/sunstone/public/app/utils/vcenter/networks/row.hbs
@@ -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>