summaryrefslogtreecommitdiff
path: root/src/server/rz_user.py
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-02-01 16:45:51 +0200
committerLV-426 <lv-426@taproot.org.il>2015-02-01 16:55:56 +0200
commit1aad3bb6d37c2b63049e04f73333e6e7f5bbb085 (patch)
tree7b9864559dd5d0ab6adebd207f59d23a5b9789c5 /src/server/rz_user.py
parent1b9c6dd3c9df12dec4ae627bcc2864e007ba4620 (diff)
rz_req_handling: make_response__{http__empty,json__html,json__redirect}(),
Diffstat (limited to 'src/server/rz_user.py')
-rw-r--r--src/server/rz_user.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/rz_user.py b/src/server/rz_user.py
index 0038cec0..caa913b4 100644
--- a/src/server/rz_user.py
+++ b/src/server/rz_user.py
@@ -10,7 +10,7 @@ import logging
import uuid
from rz_mail import send_email_message
-from rz_req_handling import make_json_response, make_response__ajax__html
+from rz_req_handling import make_response__json, make_response__json__html
log = logging.getLogger('rhizi')
@@ -138,7 +138,7 @@ def rest__user_signup():
us_req = sanitize_input(request)
except Exception as e:
log.exception(e)
- return make_response__ajax__html(status=400, html_str=html_err__tech_difficulty)
+ return make_response__json__html(status=400, html_str=html_err__tech_difficulty)
# FIXME: implement form validation
@@ -146,7 +146,7 @@ def rest__user_signup():
if None != existing_req:
# already pending
log.warning('user signup: request already pending: %s' % (existing_req))
- return make_response__ajax__html(status=200, html_str=html_ok__already_pending)
+ return make_response__json__html(status=200, html_str=html_ok__already_pending)
us_req['submission_date'] = datetime.now()
us_req['validation_key'] = generate_email_confirmation_key()
@@ -155,10 +155,10 @@ def rest__user_signup():
try:
send_user_activation_link__email(us_req)
add_user_signup_req(us_req_map, us_req)
- return make_response__ajax__html(html_str=html_ok__submitted)
+ return make_response__json__html(html_str=html_ok__submitted)
except Exception as e:
log.exception('user sign-up: failed to send validation email', e)
- return make_response__ajax__html(status=500, html_str=html_err__tech_difficulty)
+ return make_response__json__html(status=500, html_str=html_err__tech_difficulty)
if request.method == 'GET':
@@ -220,4 +220,4 @@ def send_user_activation_link__email(us_req):
except Exception:
log.exception('send_user_feedback__email: exception while sending email')
- return make_json_response(status=500)
+ return make_response__json(status=500)