Plase cancel button in it's own form

While we made sure that we didn't validate the form serverside, it would
still not be possible to cancel a form wihtout filling out required
fields since the *browser* would enforce those. For this reason, put the
cancel button in a separate form so it doens't trigger those
requirements.

diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py
index ff55583790ba67e811b8e52ff4ad3e1d28e8ad2e..1e451e56d1279abd70687f93728227bfbd5e2ed9 100644 (file)
--- a/postgresqleu/confreg/views.py
+++ b/postgresqleu/confreg/views.py
@@ -259,6 +259,8 @@ def register(request, confname, whatfor=None):
                # Did the user click cancel? We want to check that before we
                # check form.is_valid(), to avoid the user getting errors like
                # "you must specify country in order to cancel".
+               # (This is submitted as a separate form in order to avoid client-side
+               # versions of the same problem)
                if request.POST['submit'] == 'Cancel registration':
                        if reg.id:
                                reg.delete()

diff --git a/template.jinja/confreg/regform.html b/template.jinja/confreg/regform.html
index 9006a138ad770c0856114e3f855a4190b08053ee..b19516e7ab64303a9dbf3e1550bd9cccfb45448c 100644 (file)
--- a/template.jinja/confreg/regform.html
+++ b/template.jinja/confreg/regform.html
@@ -108,6 +108,8 @@ correction.</p>
  </p>
  <input type="submit" name="submit" value="Save and continue editing"><br/>
  <input type="submit" name="submit" value="Save and finish"><br/>
+</form>
+<form action="." method="post" class="pgeuregform">{{ csrf_input }}
  <input type="submit" name="submit" onclick="return confirmCancel()" value="Cancel registration"><br/>
 </form>
 {%endblock%}