Author: robbie Date: Thu Jul 19 11:23:15 2012 New Revision: 1363297 URL: http://svn.apache.org/viewvc?rev=1363297&view=rev Log: QPID-4150: Display the name of queue type key(sortKey,priorities,lvqKey) and its value
Applied patch from Oleksandr Rudyy <[email protected]> Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1363297&r1=1363296&r2=1363297&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js Thu Jul 19 11:23:15 2012 @@ -232,6 +232,18 @@ define(["dojo/_base/xhr", updater.remove( this.queueUpdater ); }; + var queueTypeKeys = { + priority: "priorities", + lvq: "lvqKey", + sorted: "sortKey" + }; + + var queueTypeKeyNames = { + priority: "Number of priorities", + lvq: "LVQ key", + sorted: "Sort key" + }; + function QueueUpdater(containerNode, queueObj, controller) { var that = this; @@ -252,6 +264,8 @@ define(["dojo/_base/xhr", "durable", "lifetimePolicy", "type", + "keyName", + "keyValue", "alertRepeatGap", "alertRepeatGapUnits", "alertThresholdMessageAge", @@ -325,8 +339,17 @@ define(["dojo/_base/xhr", this.unacknowledgedMessages.innerHTML = this.queueData["unacknowledgedMessages"]; bytesDepth = formatter.formatBytes( this.queueData["unacknowledgedBytes"] ); this.unacknowledgedBytes.innerHTML = "(" + bytesDepth.value; - this.unacknowledgedBytesUnits.innerHTML = bytesDepth.units + ")" - + this.unacknowledgedBytesUnits.innerHTML = bytesDepth.units + ")"; + if (this.queueData.type == "standard") + { + this.keyName.style.display = "none"; + this.keyValue.style.display = "none"; + } + else + { + this.keyName.innerHTML = queueTypeKeyNames[this.queueData.type] + ":"; + this.keyValue.innerHTML = this.queueData[queueTypeKeys[this.queueData.type]]; + } }; Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html?rev=1363297&r1=1363296&r2=1363297&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html Thu Jul 19 11:23:15 2012 @@ -48,6 +48,8 @@ <span class="bytesOutRateUnits" style="position:absolute; right: 0em; width: 3em"></span> <br/> <span style="">Type:</span><span style="position:absolute; left:6em" class="type"></span> + <span style="position:absolute; left:26em" class="keyName"></span> + <span style="position:absolute; right:1em" class="keyValue"></span> <br/> <br/> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bindings'"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
