Repository: qpid-dispatch Updated Branches: refs/heads/master f8f2b0ae7 -> 96db8058c
DISPATCH-832 Ensure consoles handle the removal of the deprecated entities/attributes/values from the schema Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/96db8058 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/96db8058 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/96db8058 Branch: refs/heads/master Commit: 96db8058cf7162040d3cc4df7f84a4f832bbdc9e Parents: f8f2b0a Author: Ernest Allen <eal...@redhat.com> Authored: Fri Sep 22 13:54:28 2017 -0400 Committer: Ernest Allen <eal...@redhat.com> Committed: Fri Sep 22 13:54:28 2017 -0400 ---------------------------------------------------------------------- console/hawtio/src/main/webapp/plugin/js/qdrTopology.js | 2 +- console/stand-alone/plugin/js/qdrService.js | 4 ++-- console/stand-alone/plugin/js/qdrTopology.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/96db8058/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js ---------------------------------------------------------------------- diff --git a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js index 643f518..762ef04 100644 --- a/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js +++ b/console/hawtio/src/main/webapp/plugin/js/qdrTopology.js @@ -1846,7 +1846,7 @@ QDR.log.debug("attr.description " + attr.description) legendNodes.push(node) } if (!svg.selectAll('circle.qpid-cpp').empty()) { - legendNodes.push(aNode("Qpid broker", "", "on-demand", '', undefined, 5, 0, 0, 0, false, { + legendNodes.push(aNode("Qpid broker", "", "route-container", '', undefined, 5, 0, 0, 0, false, { product: 'qpid-cpp' })) } http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/96db8058/console/stand-alone/plugin/js/qdrService.js ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/js/qdrService.js b/console/stand-alone/plugin/js/qdrService.js index 66dda1c..a57c853 100644 --- a/console/stand-alone/plugin/js/qdrService.js +++ b/console/stand-alone/plugin/js/qdrService.js @@ -303,11 +303,11 @@ console.dump(e) }, isArtemis: function(d) { - return d.nodeType === 'route-container' && d.properties.product === 'apache-activemq-artemis'; + return (d.nodeType === 'route-container' || d.nodeType === 'on-demand') && (d.properties && d.properties.product === 'apache-activemq-artemis'); }, isQpid: function(d) { - return d.nodeType === 'on-demand' && (d.properties && d.properties.product === 'qpid-cpp'); + return (d.nodeType === 'route-container' || d.nodeType === 'on-demand') && (d.properties && d.properties.product === 'qpid-cpp'); }, isAConsole: function(properties, connectionId, nodeType, key) { http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/96db8058/console/stand-alone/plugin/js/qdrTopology.js ---------------------------------------------------------------------- diff --git a/console/stand-alone/plugin/js/qdrTopology.js b/console/stand-alone/plugin/js/qdrTopology.js index a3368b4..15e804d 100644 --- a/console/stand-alone/plugin/js/qdrTopology.js +++ b/console/stand-alone/plugin/js/qdrTopology.js @@ -1860,7 +1860,7 @@ var QDR = (function(QDR) { legendNodes.push(node) } if (!svg.selectAll('circle.qpid-cpp').empty()) { - legendNodes.push(aNode("Qpid broker", "", "on-demand", '', undefined, 5, 0, 0, 0, false, { + legendNodes.push(aNode("Qpid broker", "", "route-container", '', undefined, 5, 0, 0, 0, false, { product: 'qpid-cpp' })) } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org