dbl: Support lists with a hyphen in the slug

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

diff --git a/src/web/__init__.py b/src/web/__init__.py
index bebfa0bcfaec1c377f4e71e38e985d859b9ae135..7db26e64ef877d053067e869d4fd313e55c93187 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -218,11 +218,11 @@ class Application(tornado.web.Application):
                        # DBL
                        (r"/dbl/?", StaticHandler, { "template" : "dbl/index.html" }),
                        (r"/dbl/lists", dbl.ListsHandler),
-                       (r"/dbl/lists/(\w+)", dbl.ListHandler),
-                       (r"/dbl/lists/(\w+)/domains/(.*)", dbl.ListDomainHandler),
-                       (r"/dbl/lists/(\w+)/history", dbl.ListHistoryHandler),
-                       (r"/dbl/lists/(\w+)/reports", dbl.ListReportsHandler),
-                       (r"/dbl/lists/(\w+)/sources", dbl.ListSourcesHandler),
+                       (r"/dbl/lists/([\w\-]+)", dbl.ListHandler),
+                       (r"/dbl/lists/([\w\-]+)/domains/(.*)", dbl.ListDomainHandler),
+                       (r"/dbl/lists/([\w\-]+)/history", dbl.ListHistoryHandler),
+                       (r"/dbl/lists/([\w\-]+)/reports", dbl.ListReportsHandler),
+                       (r"/dbl/lists/([\w\-]+)/sources", dbl.ListSourcesHandler),
                        (r"/dbl/report", dbl.SubmitReportHandler),
                        (r"/dbl/reports/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})", dbl.ReportHandler),
                        (r"/dbl/search", dbl.SearchHandler),