Merge branch 'stable'

This commit is contained in:
Michael Klishin 2017-01-03 19:21:27 +08:00
commit 2d78a4d009
2 changed files with 15 additions and 3 deletions

View File

@ -521,6 +521,13 @@ function show_popup(type, text, mode) {
function postprocess() {
$('form.confirm-queue').submit(function() {
return confirm("Are you sure? The queue is going to be deleted. " +
"Messages cannot be recovered after deletion.");
});
$('form.confirm-purge-queue').submit(function() {
return confirm("Are you sure? Messages cannot be recovered after purging.");
});
$('form.confirm').submit(function() {
return confirm("Are you sure? This object cannot be recovered " +
"after deletion.");

View File

@ -299,16 +299,21 @@
<% } %>
<div class="section-hidden">
<h2>Delete / purge</h2>
<h2>Delete</h2>
<div class="hider">
<form action="#/queues" method="delete" class="confirm inline-form">
<form action="#/queues" method="delete" class="confirm-queue inline-form">
<input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
<input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>
<input type="hidden" name="mode" value="delete"/>
<input type="submit" value="Delete Queue" />
</form>
</div>
</div>
<form action="#/queues" method="delete" class="inline-form-right">
<div class="section-hidden">
<h2>Purge</h2>
<div class="hider">
<form action="#/queues" method="delete" class="confirm-purge-queue inline-form">
<input type="hidden" name="vhost" value="<%= fmt_string(queue.vhost) %>"/>
<input type="hidden" name="name" value="<%= fmt_string(queue.name) %>"/>
<input type="hidden" name="mode" value="purge"/>