Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B4E617250 for ; Wed, 11 Mar 2015 22:32:15 +0000 (UTC) Received: (qmail 83342 invoked by uid 500); 11 Mar 2015 22:32:15 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 83313 invoked by uid 500); 11 Mar 2015 22:32:15 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 83304 invoked by uid 99); 11 Mar 2015 22:32:15 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Mar 2015 22:32:15 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id E1140AC0163 for ; Wed, 11 Mar 2015 22:32:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1666029 - in /qpid/branches/0.32: ./ qpid/ qpid/java/ qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/widgetconfigurer.js Date: Wed, 11 Mar 2015 22:32:14 -0000 To: commits@qpid.apache.org From: kwall@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150311223214.E1140AC0163@hades.apache.org> 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