qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1737839 - in /qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha: add/newgroup/add.js edit.js
Date Tue, 05 Apr 2016 13:57:20 GMT
Author: orudyy
Date: Tue Apr  5 13:57:20 2016
New Revision: 1737839

URL: http://svn.apache.org/viewvc?rev=1737839&view=rev
Log:
QPID-7112: [Java Broker] Fix setting of permitted nodes in Web Management Console

Modified:
    qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
    qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js

Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js?rev=1737839&r1=1737838&r2=1737839&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
(original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/add/newgroup/add.js
Tue Apr  5 13:57:20 2016
@@ -32,6 +32,7 @@ define(["dojo/_base/xhr",
   function (xhr, win, parser, dom, domConstruct, json, registry, template, util)
   {
     return {
+        permittedNodesArray: [],
         show: function(data)
         {
           var that=this;
@@ -79,6 +80,11 @@ define(["dojo/_base/xhr",
           registry.byId("addVirtualHostNode.groupName").set("regExpGen", util.nameOrContextVarRegexp);
 
           dom.byId("addVirtualHostNode.uploadFields").style.display = "block";
+
+          this.addVirtualHostNodePermittedNodes._getValueAttr = function()
+                                                                {
+                                                                    return that.permittedNodesArray;
+                                                                };
         },
         _updatePermittedNodesJson: function ()
         {
@@ -98,8 +104,7 @@ define(["dojo/_base/xhr",
               permittedNodes.push(child.value);
             }
           }
-
-          this.addVirtualHostNodePermittedNodes.set("value", permittedNodes);
+          this.permittedNodesArray = permittedNodes;
         },
         _changePermittedNodeList: function(value)
         {

Modified: qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js?rev=1737839&r1=1737838&r2=1737839&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
(original)
+++ qpid/java/trunk/bdbstore/src/main/java/resources/js/qpid/management/virtualhostnode/bdb_ha/edit.js
Tue Apr  5 13:57:20 2016
@@ -19,14 +19,16 @@
  *
  */
 define(["qpid/common/util",
+        "dojo/_base/lang",
         "dijit/registry",
         "dojo/store/Memory",
         "dojo/data/ObjectStore",
          "dojo/_base/window",
         "dojo/domReady!"],
-   function (util, registry, Memory, ObjectStore, win)
+   function (util, lang, registry, Memory, ObjectStore, win)
    {
        return {
+           permittedNodesArray: [],
            show: function(data)
            {
               var that = this;
@@ -67,6 +69,11 @@ define(["qpid/common/util",
 
               var that = this;
               this.permittedNodes = registry.byId("editVirtualHostNode.permittedNodes");
+              this.permittedNodesArray = lang.clone(data.permittedNodes);
+              this.permittedNodes._getValueAttr = function()
+                                                  {
+                                                    return that.permittedNodesArray;
+                                                  };
               this.permittedNodesList = registry.byId("editVirtualHostNode.permittedNodesList");
               this.permittedNodesList.on("change", function(value){that._changePermittedNodeList(value);});
 
@@ -177,7 +184,7 @@ define(["qpid/common/util",
                  var child = children.item(i);
                  values.push(children.item(i).value);
               }
-              this.permittedNodes.set("value", values);
+              this.permittedNodesArray = values;
            }
        };
    }



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


Mime
View raw message