Make the varnish purge admin form nicer

Have the output list the actual type of purge instead of just they
keycode, and add possibility to purge both expressions and xkey.

diff --git a/pgweb/core/views.py b/pgweb/core/views.py
index daaa86c26f7c7acc9eec6d03e2784b4172182ebe..8b0784e6c1cedfb6f23c5f99c1b55bd3cf2a0349 100644 (file)
--- a/pgweb/core/views.py
+++ b/pgweb/core/views.py
@@ -299,7 +299,7 @@ def admin_purge(request):
 
        # Fetch list of latest purges
        curs = connection.cursor()
-       curs.execute("SELECT added, completed, consumer, mode, expr FROM varnishqueue.queue q LEFT JOIN varnishqueue.consumers c ON c.consumerid=q.consumerid ORDER BY added DESC")
+       curs.execute("SELECT added, completed, consumer, CASE WHEN mode = 'K' THEN 'XKey' WHEN mode='P' THEN 'URL' ELSE 'Expression' END, expr FROM varnishqueue.queue q LEFT JOIN varnishqueue.consumers c ON c.consumerid=q.consumerid ORDER BY added DESC")
        latest = curs.fetchall()
 
        return render(request, 'core/admin_purge.html', {

diff --git a/templates/core/admin_purge.html b/templates/core/admin_purge.html
index 27bc077e183c60b68969a3811e44a8c8cfe6308a..46c417afa6ae0a95074db94686214e5b402868dc 100644 (file)
--- a/templates/core/admin_purge.html
+++ b/templates/core/admin_purge.html
@@ -12,7 +12,20 @@
 
 <div id="content-main">
  <form method="POST" action=".">{% csrf_token %}
-URL (regex, ^ is auto-added): <input type="text" name="url">
+   <table border="0" cellspacing="0">
+     <tr>
+       <td>URL (regex, ^ is auto-added):</td>
+       <td><input type="text" name="url"></td>
+     </tr>
+     <tr>
+       <td>Full expression:</td>
+       <td><input type="text" name="expr"></td>
+     </tr>
+     <tr>
+       <td>XKey:</td>
+       <td><input type="text" name="xkey"></td>
+     </tr>
+   </table>
   <input type="submit" value="Purge" />
  </form>