Author: lquack
Date: Mon Mar 28 09:38:33 2016
New Revision: 1736848
URL: http://svn.apache.org/viewvc?rev=1736848&view=rev
Log:
QPID-7112: [Java Broker] fixed util.getFormWidgetValues in util.js
dojo's widget.get() returns the string "undefined" whereas accessing the
property directly return an empty string.
This commit should go back to the old behaviour by explicitly checking for the
"undefined" string.
This will cause problems if there is a property or a value called "undefined".
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1736848&r1=1736847&r2=1736848&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Mon Mar 28 09:38:33 2016
@@ -547,17 +547,17 @@ define(["dojo/_base/xhr",
for(var i in formWidgets)
{
var widget = formWidgets[i];
- var value = widget.get("value");
- var propName = widget.get("name");
- if (propName && (widget.get("required") || value ))
+ var value = widget.get("value") != "undefined" ?
widget.get("value") : "";
+ var propName = widget.get("name") != "undefined" ?
widget.get("name") : "";
+ var required = widget.get("required") != "undefined" ?
widget.get("required") : "";
+ var excluded = widget.get("excluded") != "undefined" ?
widget.get("excluded") : "";
+ var checked = widget.get("checked") != "undefined" ?
widget.get("checked") : "";
+ var type = widget.get("type") != "undefined" ?
widget.get("type") : "";
+ if (!excluded && propName && (value || required))
{
- if (widget.get("excluded"))
- {
- continue;
- }
if (widget instanceof dijit.form.RadioButton)
{
- if (widget.get("checked"))
+ if (checked)
{
var currentValue = values[propName];
if (currentValue)
@@ -579,11 +579,11 @@ define(["dojo/_base/xhr",
}
else if (widget instanceof dijit.form.CheckBox)
{
- values[ propName ] = widget.get("checked");
+ values[ propName ] = checked;
}
else
{
- if (widget.get("type") == "password")
+ if (type == "password")
{
if (value)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
