From 16b41e3dec5ec29ffeabd1f84889eadee4afaa79 Mon Sep 17 00:00:00 2001 From: lars Date: Mon, 19 Dec 2011 03:29:47 +0000 Subject: [PATCH] hide profile-related pages if "enable_users" is False use comman instead of semicolon by default (for CSV) --- 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 4c61274..a5eb360 100755 --- a/wortschlucker/src/wortschlucker.py +++ b/wortschlucker/src/wortschlucker.py @@ -537,6 +537,8 @@ def user_logout(bobo_request): @bobo.query('/profile/resend') def resend_user_key(bobo_request, email=None, submit=None, email_sent=None): value_dict = get_default_values(bobo_request) + if not value_dict["enable_users"]: + return bobo.redirect(BASE_DICT["base_url"]) value_dict["email_sent"] = False value_dict["user_new"] = False data = {"email": email} @@ -592,6 +594,8 @@ def manage_link_in_profile(user, link, add, value_dict): @bobo.query('/profile/new') def user_create(bobo_request, email=None, submit=None, add_link=None): value_dict = get_default_values(bobo_request) + if not value_dict["enable_users"]: + return bobo.redirect(BASE_DICT["base_url"]) value_dict["user_new"] = True data = {"email": email, "add_link": add_link} if not submit: @@ -625,6 +629,8 @@ def user_create(bobo_request, email=None, submit=None, add_link=None): @bobo.query('/:del_link/forget') def show_user(bobo_request, hash_key=None, add_link=None, del_link=None): value_dict = get_default_values(bobo_request) + if not value_dict["enable_users"]: + return bobo.redirect(BASE_DICT["base_url"]) if hash_key: # overwrite the cookie-based value, if a profile is explicitely given user_hash_key = hash_key @@ -753,7 +759,7 @@ def export_poll(bobo_request, admin_hash_key=None): poll = Poll.get(poll_id) response = webob.Response(content_type="text/csv", charset=EXPORT_CHARSET) # common (excel-based) CSV format with semicolons instead of commas - writer = csv.writer(response.body_file, delimiter=";") + writer = csv.writer(response.body_file) submissions = list(poll.get_submissions()) for submission in submissions: timestamp = submission.timestamp_creation.strftime(EXPORT_DATE_FORMAT)