From 4b089f4494d8b2d2dc70a37dc90125acfe54ca9b Mon Sep 17 00:00:00 2001 From: phear Date: Sun, 13 Jan 2013 12:55:05 +0000 Subject: [PATCH] added the variable 'authlevel' to make providing context-relevant links in the templates easier. --- wortschlucker/src/wortschlucker.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wortschlucker/src/wortschlucker.py b/wortschlucker/src/wortschlucker.py index 5cb98f0..4cf6648 100755 --- a/wortschlucker/src/wortschlucker.py +++ b/wortschlucker/src/wortschlucker.py @@ -48,6 +48,7 @@ BASE_DICT = { "base_url": "/", # the trailing slash is necessary "show_navbar": True, "errors": {}, + "authlevel": "public", #authentiction level of template: one of "public" (e.g. frontpage), "poll_public" (e.g. poll_details),"poll_admin" (poll_admin_details","admin" (admin interface) } # used as the default setting for expose/close dates @@ -815,8 +816,9 @@ def vote_submission_order(bobo_request, hash_key=None, submitter=None, vote_order=None): value_dict = get_default_values(bobo_request) value_dict["errors"] = {} + value_dict["authlevel"] = "poll_public" data = {} - if submitter and is_spam_submitter_name(submitter, value_dict["errors"]): + if submitter and not is_spam_submitter_name(submitter, value_dict["errors"]): data["submitter"] = submitter.strip() if not vote_order: vote_order = "" @@ -862,6 +864,7 @@ def vote_submission_order(bobo_request, hash_key=None, submitter=None, def submit_content(bobo_request, hash_key=None, submitter=None, content=None): value_dict = get_default_values(bobo_request) value_dict["errors"] = {} + value_dict["authlevel"] = "poll_public" data = {} if content and (not is_spam_content(content, value_dict["errors"])): data["content"] = content @@ -970,6 +973,7 @@ def admin_poll(bobo_request, cancel=False, submit=None, admin_hash_key=None, aut return bobo.redirect(BASE_DICT["base_url"]) poll = Poll.get(poll_id) value_dict["poll"] = poll + value_dict["authlevel"] = "poll_admin" # cancel: return to (non-edit) admin page if cancel: return bobo.redirect(poll.get_admin_url()) @@ -1169,6 +1173,7 @@ def render_poll_admin(bobo_request, poll, add_related, del_related, count, page, value_dict["count"] = count value_dict["show_delete"] = show_delete value_dict["errors"] = errors + value_dict["authlevel"] = "poll_admin" return render("poll_admin_details.html", **value_dict) @bobo.query('/admin') @@ -1221,6 +1226,7 @@ def show_one_poll(bobo_request, poll_hash_for_admin=None, poll_hash=None, value_dict["poll"] = poll value_dict["page"] = page value_dict["count"] = count + value_dict["authlevel"] = "poll_public" return render("poll_details.html", **value_dict) else: admin_poll_id = get_poll_admin_id(poll_hash)