diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/address.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/address.js index b16f270a94..5227fc407b 100644 --- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/address.js +++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/address.js @@ -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; }; diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js index d4c8b4223a..476426658e 100644 --- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js +++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/queue.js @@ -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; }; diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js index 4ef90d5b37..197bfae4ed 100644 --- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js +++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/lib/artemis-console.js @@ -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() {