Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1744 fix removing addresses and queues with '*' or '?' in their names via hawtio console

This commit is contained in:
Stanislav Knot 2018-03-12 17:21:58 +01:00 committed by Howard Gao
parent edd25d7c8d
commit 49bb442499
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/address.js
View File

@ -90,6 +90,7 @@ var ARTEMIS = (function(ARTEMIS) {
{
name = name.substr(1,name.length -2);
}
name = ARTEMISService.artemisConsole.ownUnescape(name);
ARTEMIS.log.info(name);
var operation;
$scope.message = "Deleted address " + name;
@ -100,7 +101,7 @@ var ARTEMIS = (function(ARTEMIS) {
$scope.name = function () {
var selection = workspace.selection;
if (selection) {
return selection.title;
return ARTEMISService.artemisConsole.ownUnescape(selection.title);
}
return null;
};

3
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js
View File

@ -103,6 +103,7 @@ var ARTEMIS = (function(ARTEMIS) {
var domain = selection.domain;
var name = entries["Destination"] || entries["destinationName"] || selection.title;
name = name.replace(/['"]+/g, '');
name = ARTEMISService.artemisConsole.ownUnescape(name);
ARTEMIS.log.info(name);
var operation;
if (isQueue) {
@ -133,7 +134,7 @@ var ARTEMIS = (function(ARTEMIS) {
$scope.name = function () {
var selection = workspace.selection;
if (selection) {
return selection.title;
return ARTEMISService.artemisConsole.ownUnescape(selection.title);
}
return null;
};

5
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js
View File

@ -70,6 +70,11 @@ function ArtemisConsole() {
this.getRemoteBrokers = function (mbean, jolokia, method) {
jolokia.request({ type: 'exec', mbean: mbean, operation: 'listNetworkTopology()' }, method);
};
this.ownUnescape = function (name) {
//simple return unescape(name); does not work for this :(
return name.replace(/\\\\/g, "\\").replace(/\\\*/g, "*").replace(/\\\?/g, "?");
};
}
function getServerAttributes() {