Repository: activemq-artemis
Updated Branches:
  refs/heads/master 911072ef2 -> e80c4b96e


ARTEMIS-1715 Disable to remove a divert from hawtio console


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/eba936d0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/eba936d0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/eba936d0

Branch: refs/heads/master
Commit: eba936d0f9f6e714328d255d7b29100c451fa5d2
Parents: 911072e
Author: Stanislav Knot <sk...@redhat.com>
Authored: Thu Mar 1 15:29:22 2018 +0100
Committer: Stanislav Knot <sk...@redhat.com>
Committed: Wed Mar 7 08:41:43 2018 +0100

----------------------------------------------------------------------
 .../src/main/webapp/plugin/js/artemisPlugin.js               | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/eba936d0/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js
----------------------------------------------------------------------
diff --git 
a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js 
b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js
index d0c890a..5470aa3 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/artemisPlugin.js
@@ -230,7 +230,7 @@ var ARTEMIS = (function(ARTEMIS) {
       });
 
       workspace.subLevelTabs.push({
-         content: '<i class="icon-plus"></i> Delete',
+         content: '<i class="icon-remove"></i> Delete',
          title: "Delete an address",
          isValid: function (workspace) {
             return isAddress(workspace, artemisJmxDomain);
@@ -341,7 +341,11 @@ var ARTEMIS = (function(ARTEMIS) {
    }
 
    function isAddress(workspace, domain) {
-      return workspace.hasDomainAndProperties(domain, {'component': 
'addresses'}) && !workspace.hasDomainAndProperties(domain, {'subcomponent': 
'queues'});
+      return workspace.hasDomainAndProperties(domain, {'component': 
'addresses'}) && !workspace.hasDomainAndProperties(domain, {'subcomponent': 
'queues'}) && !workspace.hasDomainAndProperties(domain, {'subcomponent': 
'diverts'});
+   }
+
+   function isDivert(workspace, domain) {
+      return workspace.hasDomainAndProperties(domain, {'subcomponent': 
'diverts'});
    }
 
    function isQueue(workspace, domain) {

Reply via email to