Repository: qpid-broker-j Updated Branches: refs/heads/master 2c7ec1509 -> 7bc11b1aa
QPID-7925: [Broker-J] [WMC] Address review comments Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/7bc11b1a Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/7bc11b1a Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/7bc11b1a Branch: refs/heads/master Commit: 7bc11b1aaf7a33c4ec99014f57043c5df6e32f21 Parents: 2c7ec15 Author: Alex Rudyy <[email protected]> Authored: Mon Mar 26 23:21:56 2018 +0100 Committer: Alex Rudyy <[email protected]> Committed: Mon Mar 26 23:21:56 2018 +0100 ---------------------------------------------------------------------- .../js/qpid/management/accesscontrolprovider/RuleBased.js | 5 ++++- .../management/accesscontrolprovider/rulebased/LoadForm.js | 4 ++++ .../java/resources/js/qpid/management/query/QueryWidget.js | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7bc11b1a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/RuleBased.js ---------------------------------------------------------------------- diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/RuleBased.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/RuleBased.js index b1c17f7..10b3b83 100644 --- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/RuleBased.js +++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/RuleBased.js @@ -183,7 +183,10 @@ define(["dojo/_base/declare", .then(lang.hitch(this, function(){ this.loadForm.hide(); }), - this.management.xhrErrorHandler) + lang.hitch(this, function(error){ + util.xhrErrorHandler(error); + this.loadForm.reset(); + })) .always(lang.hitch(this, function () { this.loadButton.set("disabled", false); })); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7bc11b1a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/rulebased/LoadForm.js ---------------------------------------------------------------------- diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/rulebased/LoadForm.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/rulebased/LoadForm.js index 364caf6..3330ce4 100644 --- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/rulebased/LoadForm.js +++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/accesscontrolprovider/rulebased/LoadForm.js @@ -82,6 +82,10 @@ define(["dojo/_base/declare", { this.loadDialog.hide(); }, + reset: function() + { + this.path.reset(); + }, _onCancel: function () { this.emit("cancel"); this.hide(); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/7bc11b1a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js ---------------------------------------------------------------------- diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js index f87f61c..21a616c 100644 --- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js +++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/query/QueryWidget.js @@ -185,7 +185,7 @@ define(["dojo/_base/declare", cloneButtonTooltip: null, deleteButtonTooltip: null, searchForm: null, - extractButton: null, + exportButton: null, exportButtonTooltip: null, /** @@ -245,7 +245,7 @@ define(["dojo/_base/declare", this.saveButton.on("click", lang.hitch(this, this._saveQuery)); this.cloneButton.on("click", lang.hitch(this, this._cloneQuery)); this.deleteButton.on("click", lang.hitch(this, this._deleteQuery)); - this.extractButton.on("click", lang.hitch(this, this._exportQueryResults)); + this.exportButton.on("click", lang.hitch(this, this._exportQueryResults)); this._ownQuery = !this.preference || !this.preference.owner @@ -253,7 +253,7 @@ define(["dojo/_base/declare", var newQuery = !this.preference || !this.preference.createdDate; this.saveButton.set("disabled", !this._ownQuery); this.deleteButton.set("disabled", !this._ownQuery || newQuery); - this.extractButton.set("disabled", true); + this.exportButton.set("disabled", true); if (!this._ownQuery) { @@ -592,7 +592,7 @@ define(["dojo/_base/declare", _queryCompleted: function (e) { this._buildColumnsIfHeadersChanged(e.data); - this.extractButton.set("disabled", !(e.data.total && e.data.total > 0)); + this.exportButton.set("disabled", !(e.data.total && e.data.total > 0)); }, _buildColumnsIfHeadersChanged: function (data) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
