From e6ca1be9954f155a7e96988793b5ab32ec3badda Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Wed, 23 Dec 2020 16:18:51 +0100 Subject: [PATCH] report 500-error better, remove raw_html postprocessor --- motion.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/motion.py b/motion.py index 8eaa350..23d91f5 100644 --- a/motion.py +++ b/motion.py @@ -29,6 +29,7 @@ gettext.install('motion') class EscapeHtml(Extension): def extendMarkdown(self, md, md_globals): del md.preprocessors['html_block'] + del md.postprocessors['raw_html'] del md.inlinePatterns['html'] md = Markdown(app, extensions=[EscapeHtml()]) @@ -296,7 +297,10 @@ def put_motion(): if len(sr) == 0 or sr[0][0] is None: ident=prefix.per_host[cat]+"."+t.strftime("%Y%m%d")+".001" else: - ident=prefix.per_host[cat]+"."+t.strftime("%Y%m%d")+"."+("%03d" % (int(sr[0][0].split(".")[2])+1)) + nextId = int(sr[0][0].split(".")[2])+1 + if nextId >= 1000: + return _('Too many motions for this day'), 500 + ident=prefix.per_host[cat]+"."+t.strftime("%Y%m%d")+"."+("%03d" % nextId) p = db.prepare("INSERT INTO motion(\"name\", \"content\", \"deadline\", \"posed_by\", \"type\", \"identifier\", \"host\") VALUES($1, $2, CURRENT_TIMESTAMP + $3 * interval '1 days', $4, $5, $6, $7)") p(title, content, time, g.voter, cat, ident, request.host) return rel_redirect("/") -- 2.39.2