diff options
| author | Keith Wall <kwall@apache.org> | 2015-03-11 22:32:14 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2015-03-11 22:32:14 +0000 |
| commit | c976942d25d0709b2f3a7f9d8fe67c26c9e0b2e4 (patch) | |
| tree | 5ca1d2292bc4ca444269068f0bce3e5747e0e7e0 | |
| parent | fe3024576b3f7fedb171ddd517b03099b821c7d8 (diff) | |
| download | qpid-python-c976942d25d0709b2f3a7f9d8fe67c26c9e0b2e4.tar.gz | |
QPID-6440: [Java Broker] Web UI, correct problem that causes checkbox values to be corrupted in edit dialogues0.32
Merged from trunk with command
svn merge -c 1665735 https://svn.apache.org/repos/asf/qpid/trunk
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1666029 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js index af8f1fc2fb..baafc6f71d 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js @@ -119,12 +119,17 @@ define(["dojo/_base/xhr", if (widget instanceof dijit.form.FilteringSelect || widget instanceof dojox.form.CheckedMultiSelect) { - var widgetValue = dataValue ? dataValue : defaultValue; + var widgetValue = dataValue == null ? defaultValue : dataValue; if (widgetValue) { widget.set("value", widgetValue); } } + else if (widget instanceof dijit.form.CheckBox) + { + var widgetValue = dataValue == null ? (defaultValue == "true") : dataValue; + widget.set("checked", widgetValue ? true : false); + } else { if (dataValue) |