Author: kwall
Date: Wed Mar 11 22:32:14 2015
New Revision: 1666029

URL: http://svn.apache.org/r1666029
Log:
QPID-6440:  [Java Broker] Web UI, correct problem that causes checkbox values to be corrupted in edit dialogues

Merged from trunk with command

svn merge -c 1665735 https://svn.apache.org/repos/asf/qpid/trunk


Modified:
    qpid/branches/0.32/   (props changed)
    qpid/branches/0.32/qpid/   (props changed)
    qpid/branches/0.32/qpid/java/   (props changed)
    qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js

Propchange: qpid/branches/0.32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 11 22:32:14 2015
@@ -3,4 +3,4 @@
 /qpid/branches/java-broker-bdb-ha2:1576683-1583556
 /qpid/branches/java-network-refactor:805429-825319
 /qpid/branches/mcpierce-QPID-4719:1477004-1477093
-/qpid/trunk:1661162,1661165-1661166,1661207,1661530-1661531,1661693,1661741,1661929,1662051
+/qpid/trunk:1661162,1661165-1661166,1661207,1661530-1661531,1661693,1661741,1661929,1662051,1665735

Propchange: qpid/branches/0.32/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 11 22:32:14 2015
@@ -6,4 +6,4 @@
 /qpid/branches/mcpierce-QPID-4719/qpid:1477004-1477093
 /qpid/branches/qpid-2935/qpid:1061302-1072333
 /qpid/branches/qpid-3346/qpid:1144319-1179855
-/qpid/trunk/qpid:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693,1661741,1661929,1662051,1662473,1662489,1662683,1664160,1664334,1664714,1664731,1664839,1665702
+/qpid/trunk/qpid:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693,1661741,1661929,1662051,1662473,1662489,1662683,1664160,1664334,1664714,1664731,1664839,1665702,1665735

Propchange: qpid/branches/0.32/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 11 22:32:14 2015
@@ -9,4 +9,4 @@
 /qpid/branches/java-network-refactor/qpid/java:805429-821809
 /qpid/branches/qpid-2935/qpid/java:1061302-1072333
 /qpid/trunk/qpid:796646-796653
-/qpid/trunk/qpid/java:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693,1661741,1661929,1662051,1662473,1662489,1662683,1664114,1664160,1664309,1664334,1664714,1664731,1664839,1665702
+/qpid/trunk/qpid/java:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693,1661741,1661929,1662051,1662473,1662489,1662683,1664114,1664160,1664309,1664334,1664714,1664731,1664839,1665702,1665735

Modified: qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js?rev=1666029&r1=1666028&r2=1666029&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js (original)
+++ qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js Wed Mar 11 22:32:14 2015
@@ -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)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org