You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/09/06 06:25:23 UTC
[4/5] qpid-broker-j git commit: QPID-7781: [Java Broker,
WMC] Disable Add Virtual Host button on Virtual Host Node UI when
Virtual Host Node is not active
QPID-7781: [Java Broker, WMC] Disable Add Virtual Host button on Virtual Host Node UI when Virtual Host Node is not active
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/26f30a26
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/26f30a26
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/26f30a26
Branch: refs/heads/master
Commit: 26f30a26298ebcb8077134ec5936487b71cf44a4
Parents: 15bb758
Author: Alex Rudyy <or...@apache.org>
Authored: Mon Sep 4 17:00:19 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Sep 6 07:25:04 2017 +0100
----------------------------------------------------------------------
.../src/main/java/resources/js/qpid/management/Broker.js | 2 +-
.../java/resources/js/qpid/management/VirtualHostNode.js | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/26f30a26/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
index 65b0389..a89c729 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
@@ -1067,7 +1067,7 @@ define(["dojo/parser",
}
else
{
- addVirtualHostItem.set("disabled", false);
+ addVirtualHostItem.set("disabled", item.state != "ACTIVE");
viewVirtualHostItem.set("disabled", true);
startVirtualHostItem.set("disabled", true);
stopVirtualHostItem.set("disabled", true);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/26f30a26/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
----------------------------------------------------------------------
diff --git a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
index 9f2e5e1..a625618 100644
--- a/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
+++ b/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHostNode.js
@@ -286,8 +286,8 @@ define(["dojo/parser",
return "<input type='checkbox' disabled='disabled' " + (val ? "checked='checked'" : "") + " />";
}
- this.tabObject.startNodeButton.set("disabled", !(data.state == "STOPPED" || data.state == "ERRORED"));
- this.tabObject.stopNodeButton.set("disabled", data.state != "ACTIVE");
+ this.tabObject.startNodeButton.set("disabled", !(data.state === "STOPPED" || data.state === "ERRORED"));
+ this.tabObject.stopNodeButton.set("disabled", data.state !== "ACTIVE");
this.name.innerHTML = entities.encode(String(data["name"]));
this.state.innerHTML = entities.encode(String(data["state"]));
@@ -315,8 +315,8 @@ define(["dojo/parser",
util.updateUpdatableStore(this.tabObject.vhostsGrid, data.virtualhosts);
var virtualHostExists = !!data.virtualhosts;
- this.tabObject.addVirtualHostButton.set("disabled", virtualHostExists);
- this.tabObject.deleteVirtualHostButton.set("disabled", !virtualHostExists);
+ this.tabObject.addVirtualHostButton.set("disabled", data.state !== "ACTIVE" || virtualHostExists);
+ this.tabObject.deleteVirtualHostButton.set("disabled", data.state !== "ACTIVE" || !virtualHostExists);
};
return VirtualHostNode;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org