github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-05 03:00:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't display captcha and ratelimit fields when they aren't needed.

Browse Source
This commit is contained in:
Bryce Boe
2012-04-17 00:18:21 -07:00
committed by Neil Williams
parent 766dd00ca7
commit 2248c4a2f3
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
r2/r2/controllers/validator/validator.py
View File

@@ -237,21 +237,18 @@ def validatedForm(self, self_method, responder, simple_vals, param_vals,
# clear out the status line as a courtesy
form.set_html(".status", "")
# handle specific errors
if c.errors.errors:
handled_captcha = handled_ratelimit = False
for v in simple_vals:
if not handled_captcha and isinstance(v, VCaptcha):
form.has_errors('captcha', errors.BAD_CAPTCHA)
form.new_captcha()
handled_captcha = True
elif not handled_ratelimit and isinstance(v, VRatelimit):
form.ratelimit(v.seconds)
handled_ratelimit = True
# do the actual work
val = self_method(self, form, responder, *a, **kw)
# add data to the output on some errors
for validator in simple_vals:
if (isinstance(validator, VCaptcha) and
form.has_errors('captcha', errors.BAD_CAPTCHA)):
form.new_captcha()
elif (isinstance(validator, VRatelimit) and
form.has_errors('ratelimit', errors.RATELIMIT)):
form.ratelimit(validator.seconds)
if val:
return val
else: