dbl: Allow to preselect the block/allow option

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/dbl/reports/submit.html b/src/templates/dbl/reports/submit.html
index 9040b1c79e0011377c1a6537f986e988d78ff76b..44a0ffb21dec533053b68bf5fa721a6f62813403 100644 (file)
--- a/src/templates/dbl/reports/submit.html
+++ b/src/templates/dbl/reports/submit.html
@@ -99,11 +99,11 @@
                                                                <div class="control">
                                                                        <div class="select is-fullwidth">
                                                                                <select name="block" required>
-                                                                                       <option value="yes">
+                                                                                       <option value="yes" {% if block %}selected{% end %}>
                                                                                                {{ _("This domain should be blocked, but isn't") }}
                                                                                        </option>
 
-                                                                                       <option value="no">
+                                                                                       <option value="no" {% if not block %}selected{% end %}>
                                                                                                {{ _("This domain should not be blocked, but currently is") }}
                                                                                        </option>
                                                                                </select>

diff --git a/src/web/dbl.py b/src/web/dbl.py
index 10f3b16ea637bd29851426c261e420dad2e0ba6e..15ee0cac27098526ee5081ef371830d69ed8486e 100644 (file)
--- a/src/web/dbl.py
+++ b/src/web/dbl.py
@@ -102,8 +102,12 @@ class SubmitReportHandler(base.AnalyticsMixin, BaseHandler):
                # Fetch any pre-selected names
                name = self.get_argument("name", None)
 
+               # Block or not?
+               block = self.get_argument_bool("block")
+
                # Render the page
-               self.render("dbl/reports/submit.html", lists=lists, list=list, name=name)
+               self.render("dbl/reports/submit.html",
+                       lists=lists, list=list, name=name, block=block)
 
        @tornado.web.authenticated
        @base.ratelimit(minutes=60, requests=10)
@@ -116,7 +120,7 @@ class SubmitReportHandler(base.AnalyticsMixin, BaseHandler):
                        name        = self.get_argument("name"),
                        reported_by = self.current_user,
                        comment     = self.get_argument("comment", ""),
-                       block       = self.get_argument("block", "off") == "on",
+                       block       = self.get_argument_bool("block"),
                )
 
                # Render a result page