You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by mi...@apache.org on 2018/03/05 04:04:07 UTC
[1/2] activemq-artemis git commit: This closes #1921
Repository: activemq-artemis
Updated Branches:
refs/heads/master 985a8cf7e -> 95b7438e7
This closes #1921
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/95b7438e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/95b7438e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/95b7438e
Branch: refs/heads/master
Commit: 95b7438e7a7661692d5b78be944d05e254df9067
Parents: 985a8cf b012766
Author: Michael Andre Pearce <mi...@me.com>
Authored: Mon Mar 5 04:03:50 2018 +0000
Committer: Michael Andre Pearce <mi...@me.com>
Committed: Mon Mar 5 04:03:50 2018 +0000
----------------------------------------------------------------------
.../src/main/webapp/plugin/js/artemisPlugin.js | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/2] activemq-artemis git commit: ARTEMIS-1725 fix browsing
non-listing tabs under JMX
Posted by mi...@apache.org.
ARTEMIS-1725 fix browsing non-listing tabs under JMX
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b012766b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b012766b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b012766b
Branch: refs/heads/master
Commit: b012766b9f5b3125be655cb8dd32ea773c603c7c
Parents: 985a8cf
Author: Stanislav Knot <sk...@redhat.com>
Authored: Fri Mar 2 14:18:19 2018 +0100
Committer: Michael Andre Pearce <mi...@me.com>
Committed: Mon Mar 5 04:03:50 2018 +0000
----------------------------------------------------------------------
.../src/main/webapp/plugin/js/artemisPlugin.js | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b012766b/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 72c881f..d0c890a 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
@@ -105,12 +105,21 @@ var ARTEMIS = (function(ARTEMIS) {
.when('/artemis/browseQueue', {
templateUrl: ARTEMIS.templatePath + 'browseQueue.html'
})
+ .when('/jmx/browseQueue', {
+ templateUrl: ARTEMIS.templatePath + 'browseQueue.html'
+ })
.when('/artemis/diagram', {
templateUrl: ARTEMIS.templatePath + 'brokerDiagram.html'
})
+ .when('/jmx/diagram', {
+ templateUrl: ARTEMIS.templatePath + 'brokerDiagram.html'
+ })
.when('/artemis/sendMessage', {
templateUrl: ARTEMIS.templatePath + 'sendMessage.html'
})
+ .when('/jmx/sendMessage', {
+ templateUrl: ARTEMIS.templatePath + 'sendMessage.html'
+ })
.when('/artemis/connections', {
templateUrl: ARTEMIS.templatePath + 'connections.html'
})
@@ -257,21 +266,21 @@ var ARTEMIS = (function(ARTEMIS) {
content: '<i class="icon-envelope"></i> Browse',
title: "Browse the messages on the queue",
isValid: function (workspace) { return isQueue(workspace, artemisJmxDomain); },
- href: function () { return "#/artemis/browseQueue"; }
+ href: function () { if (workspace.isTopTabActive("artemis")) return "#/artemis/browseQueue"; else return "#/jmx/browseQueue";}
});
workspace.subLevelTabs.push({
content: '<i class="icon-pencil"></i> Send',
title: "Send a message to this address",
isValid: function (workspace) { return isAddress(workspace, artemisJmxDomain) || isQueue(workspace, artemisJmxDomain); },
- href: function () { return "#/artemis/sendMessage"; }
+ href: function () { if (workspace.isTopTabActive("artemis")) return "#/artemis/sendMessage"; else return "#/jmx/sendMessage";}
});
workspace.subLevelTabs.unshift({
content: '<i class="icon-picture"></i> Diagram |',
title: "View a diagram of the producers, destinations and consumers",
isValid: function (workspace) { return workspace.isTopTabActive("artemis") || workspace.selectionHasDomain(artemisJmxDomain); },
- href: function () { return "#/artemis/diagram"; }
+ href: function () { if (workspace.isTopTabActive("artemis"))return "#/artemis/diagram"; else return "#/jmx/diagram";}
});
workspace.subLevelTabs.unshift({