summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2013-05-09 09:57:55 +0000
committerRobert Gemmell <robbie@apache.org>2013-05-09 09:57:55 +0000
commit3970c2521d5ecc1c449de4c685efc1b186d36332 (patch)
treeedb6a9e16023fcecb5fd851be665f9bc2feb8219
parent2a32e7cdaff070e359d7699abb02b12e0dae06ea (diff)
downloadqpid-python-3970c2521d5ecc1c449de4c685efc1b186d36332.tar.gz
QPID-4823: add missing entry to AddQueue dialog for setting the 'alertThresholdQueueDepthBytes' attribute
merged from trunk r1480581 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.22@1480583 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html11
-rw-r--r--qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js1
2 files changed, 11 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
index 90a0af7ea9..76123296b1 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
@@ -115,7 +115,16 @@
<!-- x-qpid-maximum-message-count -->
<tr>
<td valign="top"><strong>Queue Depth: </strong></td>
- <td><input type="text" required="false" name="alertThresholdQueueDepthMessages" id="formAddQueue.maximumMessageCount" placeholder="Count of messages"
+ <td><input type="text" required="false" name="alertThresholdQueueDepthMessages" id="formAddQueue.maximumMessageCount" placeholder="Number of messages"
+ dojoType="dijit.form.ValidationTextBox"
+ trim="true"
+ regexp="[0-9]+"
+ invalidMessage= "Invalid value" /></td>
+ </tr>
+ <!-- x-qpid-maximum-queue-depth -->
+ <tr>
+ <td valign="top"><strong>Queue Depth: </strong></td>
+ <td><input type="text" required="false" name="alertThresholdQueueDepthBytes" id="formAddQueue.maximumQueueDepth" placeholder="Total message size in bytes"
dojoType="dijit.form.ValidationTextBox"
trim="true"
regexp="[0-9]+"
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
index 53f82aff48..b1357f8c98 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
@@ -63,6 +63,7 @@ define(["dojo/_base/xhr",
queueFlowResumeSizeBytes: parseInt,
alertThresholdMessageSize: parseInt,
alertThresholdQueueDepthMessages: parseInt,
+ alertThresholdQueueDepthBytes: parseInt,
maximumDeliveryAttempts: parseInt,
alertThresholdMessageAge: parseInt,
alertRepeatGap: parseInt