You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/04/29 10:57:01 UTC

svn commit: r1741584 - /qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js

Author: lquack
Date: Fri Apr 29 08:57:01 2016
New Revision: 1741584

URL: http://svn.apache.org/viewvc?rev=1741584&view=rev
Log:
QPID-7165: [Java Broker] Fix opening query from VirtualHost tab and sort visualisation in advanced mode

Modified:
    qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js

Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js?rev=1741584&r1=1741583&r2=1741584&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryBuilder.js Fri Apr 29 08:57:01 2016
@@ -231,6 +231,7 @@ define(["dojo/_base/declare",
                                 _advancedModeOrderByChanged: function()
                                             {
                                                 this._store.orderBy = this.advancedOrderBy.value;
+                                                this._sort = [];
                                             },
                                 _toggleSearchButton: function(select)
                                              {
@@ -502,7 +503,7 @@ define(["dojo/_base/declare",
                                                  var name = data[i][2];
                                                  var parentName = data[i][1];
                                                  items.push({id: data[i][0],  name: "VH:" + parentName + "/" + name});
-                                                 this._scopeModelObjects[data[i].id] = {name: name,
+                                                 this._scopeModelObjects[data[i][0]] = {name: name,
                                                                                         type: "virtualhost",
                                                                                         parent: {name: parentName,
                                                                                                  type: "virtualhostnode",
@@ -515,7 +516,7 @@ define(["dojo/_base/declare",
                                                      this.parentModelObj.parent &&
                                                      this.parentModelObj.parent.name == parentName)
                                                  {
-                                                   defaultValue = data[i].id;
+                                                   defaultValue = data[i][0];
                                                  }
                                                }
 
@@ -592,6 +593,7 @@ define(["dojo/_base/declare",
                                                   this._store.selectClause = this.advancedSelect.value;
                                                   this._store.where = this.advancedWhere.value;
                                                   this._store.orderBy = this.advancedOrderBy.value;
+                                                  this._sort = [];
                                                   this.search();
                                               }
                                             },



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