Author: kwall
Date: Tue Feb 24 13:41:21 2015
New Revision: 1661946

URL: http://svn.apache.org/r1661946
Log:
QPID-6407: Edit dialogue for BDB HA does not faithfully populate attributes 
node priority or required number of nodes

Merged from trunk with command:

svn merge -c 1661693  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/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
    
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
    
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
    
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
    
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
    
qpid/branches/0.32/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
    
qpid/branches/0.32/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
    
qpid/branches/0.32/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
    
qpid/branches/0.32/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
    
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
    
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
    
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
    
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
    
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js

Propchange: qpid/branches/0.32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 13:41:21 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
+/qpid/trunk:1661162,1661165-1661166,1661207,1661530-1661531,1661693

Propchange: qpid/branches/0.32/qpid/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 13:41:21 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
+/qpid/trunk/qpid:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693

Propchange: qpid/branches/0.32/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 13:41:21 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
+/qpid/trunk/qpid/java:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693

Modified: 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb/edit.js
 Tue Feb 24 13:41:21 2015
@@ -22,7 +22,7 @@ define(["dijit/registry", "qpid/common/u
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, 
"virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null,
+              util.parseHtmlIntoDiv(data.containerNode, 
"virtualhost/sizemonitoring/edit.html",
               function()
               {
                   
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", 
util.numericOrContextVarRegexp);

Modified: 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhost/bdb_ha/edit.js
 Tue Feb 24 13:41:21 2015
@@ -22,7 +22,7 @@ define(["qpid/common/util", "qpid/common
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, 
"virtualhost/bdb_ha/edit.html", "editVirtualHost.", null, null,
+              util.parseHtmlIntoDiv(data.containerNode, 
"virtualhost/bdb_ha/edit.html",
               function()
               {
                   
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", 
util.numericOrContextVarRegexp);

Modified: 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb/edit.js
 Tue Feb 24 13:41:21 2015
@@ -22,7 +22,7 @@ define(["qpid/common/util", "dijit/regis
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, 
"virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], 
data.data,
+              util.parseHtmlIntoDiv(data.containerNode, 
"virtualhostnode/filebased/edit.html",
               function()
               {
                 registry.byId("editVirtualHostNode.storePath").set("disabled", 
!(data.data.state == "STOPPED" || data.data.state == "ERRORED"));

Modified: 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
 Tue Feb 24 13:41:21 2015
@@ -26,14 +26,11 @@ define(["qpid/common/util",
         "dojo/domReady!"],
    function (util, registry, Memory, ObjectStore, win)
    {
-       var fields = [ "storePath", "name", "groupName", "address",
-                      "designatedPrimary", "priority",  "quorumOverride"];
-
        return {
            show: function(data)
            {
               var that = this;
-              util.buildEditUI(data.containerNode, 
"virtualhostnode/bdb_ha/edit.html", "editVirtualHostNode.", fields, data.data,
+              util.parseHtmlIntoDiv(data.containerNode, 
"virtualhostnode/bdb_ha/edit.html",
                 function(){that._postParse(data);});
            },
            _postParse: function(data)

Modified: 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
 (original)
+++ 
qpid/branches/0.32/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html
 Tue Feb 24 13:41:21 2015
@@ -117,11 +117,11 @@
             <div data-dojo-type="dojo/store/Memory" 
data-dojo-id="nodePriorityStore"
                  data-dojo-props="data: [
                                                       {id: '0', name: 'Never'},
-                                                      {id: '1', name: 
'Default', selected: '1'},
+                                                      {id: '1', name: 
'Default'},
                                                       {id: '2', name: 'High'},
                                                       {id: '3', name: 
'Highest'}
                                                    ]"></div>
-            <input id="editVirtualHostNode.priority" 
data-dojo-type="dijit/form/FilteringSelect" value="1"
+            <input id="editVirtualHostNode.priority" 
data-dojo-type="dijit/form/FilteringSelect"
                    data-dojo-props="
                                 name: 'priority',
                                 required: false,
@@ -135,9 +135,9 @@
         <div class="formLabel-labelCell tableContainer-labelCell">Required 
minimum number of nodes: </div>
         <div class="formLabel-controlCell tableContainer-valueCell">
             <div data-dojo-type="dojo/store/Memory" 
data-dojo-id="nodeQuorumOverrideStore"
-                 data-dojo-props="data: [{id: '0', name: 'Majority', selected: 
'1'}]"></div>
+                 data-dojo-props="data: [{id: '0', name: 'Majority'}]"></div>
             <input type="text" id="editVirtualHostNode.quorumOverride"
-                   data-dojo-type="dijit/form/FilteringSelect" value="0"
+                   data-dojo-type="dijit/form/FilteringSelect"
                    data-dojo-props="
                                 name: 'quorumOverride',
                                 required: false,

Modified: 
qpid/branches/0.32/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhost/derby/edit.js
 Tue Feb 24 13:41:21 2015
@@ -22,7 +22,7 @@ define(["qpid/common/util", "dijit/regis
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, 
"virtualhost/sizemonitoring/edit.html", "editVirtualHost.", null, null,
+              util.parseHtmlIntoDiv(data.containerNode, 
"virtualhost/sizemonitoring/edit.html",
               function()
               {
                   
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", 
util.numericOrContextVarRegexp);

Modified: 
qpid/branches/0.32/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/broker-plugins/derby-store/src/main/java/resources/js/qpid/management/virtualhostnode/derby/edit.js
 Tue Feb 24 13:41:21 2015
@@ -22,7 +22,7 @@ define(["qpid/common/util", "dijit/regis
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, 
"virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], 
data.data,
+              util.parseHtmlIntoDiv(data.containerNode, 
"virtualhostnode/filebased/edit.html",
               function()
               {
                 registry.byId("editVirtualHostNode.storePath").set("disabled", 
data.data.state != "STOPPED");

Modified: 
qpid/branches/0.32/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhost/jdbc/edit.js
 Tue Feb 24 13:41:21 2015
@@ -29,12 +29,12 @@ define(["qpid/common/util",
    function (util, poolTypeJsonString, array, json, string, Memory, dom, 
domConstruct, registry)
    {
 
-       var fieldNames = ["connectionUrl", "username", "connectionPoolType"];
        return {
            show: function(data)
            {
               var that = this;
-              util.buildEditUI(data.containerNode, 
"virtualhost/jdbc/edit.html", "editVirtualHost.", fieldNames, data.data, 
function(){that._postParse(data)});
+              util.parseHtmlIntoDiv(data.containerNode, 
"virtualhost/jdbc/edit.html",
+                function(){that._postParse(data)});
            },
            _postParse: function(data)
            {

Modified: 
qpid/branches/0.32/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/js/qpid/management/virtualhostnode/jdbc/edit.js
 Tue Feb 24 13:41:21 2015
@@ -28,13 +28,11 @@ define(["qpid/common/util",
         "dojo/domReady!"],
    function (util, poolTypeJsonString, array, json, string, Memory, dom, 
domConstruct, registry)
    {
-        var fieldNames = ["connectionUrl", "username", "connectionPoolType"];
         return {
             show: function(data)
             {
                 var that = this;
-                util.buildEditUI(data.containerNode, 
"virtualhostnode/jdbc/edit.html", "editVirtualHostNode.",
-                                 fieldNames, data.data, function(){ 
that._postParse(data);});
+                util.parseHtmlIntoDiv(data.containerNode, 
"virtualhostnode/jdbc/edit.html", function(){ that._postParse(data);});
             },
             _postParse: function(data)
             {

Modified: 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
 (original)
+++ 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
 Tue Feb 24 13:41:21 2015
@@ -19,31 +19,34 @@
 <div class="dijitHidden">
   <div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Edit Virtual 
Host'" id="editVirtualHostNodeDialog">
       <form id="editVirtualHostNodeForm" method="post" 
data-dojo-type="dijit/form/Form">
-        <div id="editVirtualHostNode.contentPane">
-          <div class="editNoteBanner">NOTE: All changes will only take effect 
after Virtual Host Node restart.</div>
-          <div class="clear">
-              <div class="formLabel-labelCell 
tableContainer-labelCell">Name*:</div>
-              <div class="formLabel-controlCell tableContainer-valueCell">
-                  <input type="text" id="editVirtualHostNode.name"
-                         data-dojo-type="dijit/form/ValidationTextBox"
-                         data-dojo-props="
+          <div id="editVirtualHostNode.allFields">
+              <div id="editVirtualHostNode.contentPane">
+                  <div class="editNoteBanner">NOTE: All changes will only take 
effect after Virtual Host Node restart.</div>
+                  <div class="clear">
+                      <div class="formLabel-labelCell 
tableContainer-labelCell">Name*:</div>
+                      <div class="formLabel-controlCell 
tableContainer-valueCell">
+                          <input type="text" id="editVirtualHostNode.name"
+                                 data-dojo-type="dijit/form/ValidationTextBox"
+                                 data-dojo-props="
                               name: 'name',
                               placeHolder: 'name',
                               required: true,
                               missingMessage: 'Name must be supplied',
                               disabled: true,
                               title: 'Enter virtual host name'" />
-              </div>
-          </div>
+                      </div>
+                  </div>
 
-          <div id="editVirtualHostNode.typeFields"></div>
+                  <div id="editVirtualHostNode.typeFields"></div>
 
-          <div class="clear"></div>
+                  <div class="clear"></div>
 
-          <div data-dojo-type="dijit/TitlePane" data-dojo-props="title: 
'Context variables',  open: false">
-                  <div id="editVirtualHostNode.context" ></div>
+                  <div data-dojo-type="dijit/TitlePane" 
data-dojo-props="title: 'Context variables',  open: false">
+                      <div id="editVirtualHostNode.context" ></div>
+                  </div>
+              </div>
           </div>
-        </div>
+
         <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar">
               <button data-dojo-type="dijit/form/Button" 
id="editVirtualHostNode.saveButton" data-dojo-props="label: 
'Save'">Save</button>
               <button data-dojo-type="dijit/form/Button" 
id="editVirtualHostNode.cancelButton" data-dojo-props="label: 'Cancel'" 
></button>

Modified: 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
 Tue Feb 24 13:41:21 2015
@@ -565,29 +565,6 @@ define(["dojo/_base/xhr",
 
            }
 
-           util.buildEditUI = function(containerNode, htmlTemplateLocation, 
fieldNamePrefix, fieldNames, data, postParseCallback)
-           {
-               this.parseHtmlIntoDiv(containerNode, htmlTemplateLocation, 
function()
-               {
-
-                if (fieldNames)
-                {
-                   for(var i = 0; i < fieldNames.length; i++)
-                   {
-                     var fieldName = fieldNames[i];
-                     var widget = registry.byId(fieldNamePrefix + fieldName);
-                     widget.set("value", data[fieldName]);
-                   }
-                }
-
-                if (postParseCallback && typeof postParseCallback == 
"function")
-                {
-                    postParseCallback();
-                }
-
-               });
-           }
-
            util.updateUI = function(data, fieldNames, obj)
            {
              for(var i=0; i<fieldNames.length;i++)

Modified: 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
 Tue Feb 24 13:41:21 2015
@@ -57,6 +57,7 @@ define(["dojo/_base/xhr",
       _postParse: function()
       {
         var that=this;
+        this.allFieldsContainer = dom.byId("editVirtualHostNode.allFields");
         this.typeFieldsContainer = dom.byId("editVirtualHostNode.typeFields");
         this.dialog = registry.byId("editVirtualHostNodeDialog");
         this.saveButton = registry.byId("editVirtualHostNode.saveButton");
@@ -164,7 +165,7 @@ define(["dojo/_base/xhr",
                     TypeUI.show({containerNode:that.typeFieldsContainer, 
parent: that, data: actualData, effectiveData: effectiveData});
                     that.form.connectChildren();
 
-                    util.applyMetadataToWidgets(that.allFieldsContainer, 
"VirtualHostNode", actualData.type);
+                    util.applyToWidgets(that.allFieldsContainer, 
"VirtualHostNode", actualData.type, actualData);
                 }
                 catch(e)
                 {

Modified: 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhost/providedstore/edit.js
 Tue Feb 24 13:41:21 2015
@@ -20,11 +20,10 @@
 define(["dijit/registry", "qpid/common/util", "dojo/domReady!"],
    function (registry, util)
    {
-       var fieldNames = ["storeUnderfullSize", "storeOverfullSize"];
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, 
"virtualhost/providedstore/edit.html", "editVirtualHost.", fieldNames, 
data.data,
+              util.parseHtmlIntoDiv(data.containerNode, 
"virtualhost/providedstore/edit.html",
               function()
               {
                   
registry.byId("editVirtualHost.storeUnderfullSize").set("regExpGen", 
util.numericOrContextVarRegexp);

Modified: 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js
URL: 
http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js?rev=1661946&r1=1661945&r2=1661946&view=diff
==============================================================================
--- 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js
 (original)
+++ 
qpid/branches/0.32/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/virtualhostnode/json/edit.js
 Tue Feb 24 13:41:21 2015
@@ -22,7 +22,7 @@ define(["qpid/common/util", "dijit/regis
        return {
            show: function(data)
            {
-              util.buildEditUI(data.containerNode, 
"virtualhostnode/filebased/edit.html", "editVirtualHostNode.", ["storePath"], 
data.data,
+              util.parseHtmlIntoDiv(data.containerNode, 
"virtualhostnode/filebased/edit.html",
               function()
               {
                 registry.byId("editVirtualHostNode.storePath").set("disabled", 
!(data.data.state == "STOPPED" || data.data.state == "ERRORED"));



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

Reply via email to