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

Allow setting/clearing flair on deleted accounts.

Browse Source
This commit is contained in:
Logan Hanks
2011-08-05 10:57:18 -07:00
parent 93c17b8b95
commit 13430c5b52
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
r2/r2/controllers/api.py
View File

@@ -1930,7 +1930,7 @@ class ApiController(RedditController):
@validatedForm(VFlairManager(),
VModhash(),
user = VExistingUname("name"),
user = VExistingUname("name", allow_deleted=True),
text = VFlairText("text"),
css_class = VFlairCss("css_class"))
def POST_flair(self, form, jquery, user, text, css_class):
@@ -1993,7 +1993,7 @@ class ApiController(RedditController):
line_result.error('row', 'improperly formatted row, ignoring')
continue
user = VExistingUname('name').run(name)
user = VExistingUname('name', allow_deleted=True).run(name)
if not user:
line_result.error('user',
"unable to resolve user `%s', ignoring"

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

@@ -887,7 +887,8 @@ class VUrl(VRequired):
return self.error(errors.BAD_URL)
class VOptionalExistingUname(VRequired):
def __init__(self, item, *a, **kw):
def __init__(self, item, allow_deleted=False, *a, **kw):
self.allow_deleted = allow_deleted
VRequired.__init__(self, item, errors.NO_USER, *a, **kw)
def run(self, name):
@@ -903,7 +904,7 @@ class VOptionalExistingUname(VRequired):
name = chkuser(name)
if name:
try:
return Account._by_name(name)
return Account._by_name(name, allow_deleted=self.allow_deleted)
except NotFound:
return self.error(errors.USER_DOESNT_EXIST)