[PATCH] UI bug fix: Set vlan_id value only if 'Enable VLAN' is checked
From: Aline Manera <alinefm@br.ibm.com> Commit 2f54aaba added a checkbox to provide choice of enabling vlan tagging while creating a bridged network, but it doesn't check the checkbox before setting the vlan_id to send server request. Because that when the user tries to create a bridged network without enabling VLAN the following error is raised: Invalid parameter: 'None is not of type u'integer'' Fix it by setting vlan_id only if the vlan checkbox is checked. Signed-off-by: Aline Manera <alinefm@br.ibm.com> --- ui/js/src/kimchi.network.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 65479b2..9bd0cb5 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -136,12 +136,14 @@ kimchi.initNetworkCreation = function() { var data = { name : network.name, connection: network.type, - vlan_id: network.vlan_id, }; if (network.type === kimchi.NETWORK_TYPE_BRIDGE) { data.connection = "bridge"; data.interface = network.interface; - data.vlan_id = network.vlan_id; + if ($("#enableVlan").prop("checked")) { + alert('está checked') + data.vlan_id = network.vlan_id; + } } kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down"; -- 1.7.10.4
Reviewed-by: Daniel Barboza <danielhb@linux.vnet.ibm.com> On 01/10/2014 02:33 PM, Aline Manera wrote:
From: Aline Manera <alinefm@br.ibm.com>
Commit 2f54aaba added a checkbox to provide choice of enabling vlan tagging while creating a bridged network, but it doesn't check the checkbox before setting the vlan_id to send server request.
Because that when the user tries to create a bridged network without enabling VLAN the following error is raised: Invalid parameter: 'None is not of type u'integer''
Fix it by setting vlan_id only if the vlan checkbox is checked.
Signed-off-by: Aline Manera <alinefm@br.ibm.com> --- ui/js/src/kimchi.network.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 65479b2..9bd0cb5 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -136,12 +136,14 @@ kimchi.initNetworkCreation = function() { var data = { name : network.name, connection: network.type, - vlan_id: network.vlan_id, }; if (network.type === kimchi.NETWORK_TYPE_BRIDGE) { data.connection = "bridge"; data.interface = network.interface; - data.vlan_id = network.vlan_id; + if ($("#enableVlan").prop("checked")) { + alert('está checked') + data.vlan_id = network.vlan_id; + } } kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down";
On 01/11/2014 12:33 AM, Aline Manera wrote:
From: Aline Manera <alinefm@br.ibm.com>
Commit 2f54aaba added a checkbox to provide choice of enabling vlan tagging while creating a bridged network, but it doesn't check the checkbox before setting the vlan_id to send server request.
Because that when the user tries to create a bridged network without enabling VLAN the following error is raised: Invalid parameter: 'None is not of type u'integer''
Fix it by setting vlan_id only if the vlan checkbox is checked.
Signed-off-by: Aline Manera <alinefm@br.ibm.com> --- ui/js/src/kimchi.network.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 65479b2..9bd0cb5 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -136,12 +136,14 @@ kimchi.initNetworkCreation = function() { var data = { name : network.name, connection: network.type, - vlan_id: network.vlan_id, }; if (network.type === kimchi.NETWORK_TYPE_BRIDGE) { data.connection = "bridge"; data.interface = network.interface; - data.vlan_id = network.vlan_id; + if ($("#enableVlan").prop("checked")) { + alert('está checked') I am sorry for the bug. But is the alert message Portuguese? + data.vlan_id = network.vlan_id; + } } kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down";
On 01/13/2014 01:21 AM, Mark Wu wrote:
On 01/11/2014 12:33 AM, Aline Manera wrote:
From: Aline Manera <alinefm@br.ibm.com>
Commit 2f54aaba added a checkbox to provide choice of enabling vlan tagging while creating a bridged network, but it doesn't check the checkbox before setting the vlan_id to send server request.
Because that when the user tries to create a bridged network without enabling VLAN the following error is raised: Invalid parameter: 'None is not of type u'integer''
Fix it by setting vlan_id only if the vlan checkbox is checked.
Signed-off-by: Aline Manera <alinefm@br.ibm.com> --- ui/js/src/kimchi.network.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 65479b2..9bd0cb5 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -136,12 +136,14 @@ kimchi.initNetworkCreation = function() { var data = { name : network.name, connection: network.type, - vlan_id: network.vlan_id, }; if (network.type === kimchi.NETWORK_TYPE_BRIDGE) { data.connection = "bridge"; data.interface = network.interface; - data.vlan_id = network.vlan_id; + if ($("#enableVlan").prop("checked")) { + alert('está checked') I am sorry for the bug. But is the alert message Portuguese? yeap =P + data.vlan_id = network.vlan_id; + } } kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down";
_______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel
On 01/13/2014 01:21 AM, Mark Wu wrote:
On 01/11/2014 12:33 AM, Aline Manera wrote:
From: Aline Manera <alinefm@br.ibm.com>
Commit 2f54aaba added a checkbox to provide choice of enabling vlan tagging while creating a bridged network, but it doesn't check the checkbox before setting the vlan_id to send server request.
Because that when the user tries to create a bridged network without enabling VLAN the following error is raised: Invalid parameter: 'None is not of type u'integer''
Fix it by setting vlan_id only if the vlan checkbox is checked.
Signed-off-by: Aline Manera <alinefm@br.ibm.com> --- ui/js/src/kimchi.network.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 65479b2..9bd0cb5 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -136,12 +136,14 @@ kimchi.initNetworkCreation = function() { var data = { name : network.name, connection: network.type, - vlan_id: network.vlan_id, }; if (network.type === kimchi.NETWORK_TYPE_BRIDGE) { data.connection = "bridge"; data.interface = network.interface; - data.vlan_id = network.vlan_id; + if ($("#enableVlan").prop("checked")) { + alert('está checked') I am sorry for the bug. But is the alert message Portuguese?
Ops... I used this alert for testing. I will remove it in V2.
+ data.vlan_id = network.vlan_id; + } } kimchi.createNetwork(data, function(result) { network.state = result.state === "active" ? "up" : "down";
participants (4)
-
Aline Manera -
Daniel H Barboza -
Mark Wu -
Rodrigo Trujillo