From d140e00bcd7fc24be45c6321e5845101db24941c Mon Sep 17 00:00:00 2001 From: bsimpson63 Date: Wed, 18 Jul 2012 19:43:33 -0400 Subject: [PATCH] Allow filtering of modactions by deleted users. --- r2/r2/controllers/front.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py index 24c33a1a1..bea5c56da 100755 --- a/r2/r2/controllers/front.py +++ b/r2/r2/controllers/front.py @@ -405,7 +405,7 @@ class FrontController(RedditController): @prevent_framing_and_css(allow_cname_frame=True) @paginated_listing(max_page_size=500, backend='cassandra') - @validate(mod=VAccountByName('mod'), + @validate(mod=nop('mod'), action=VOneOf('type', ModAction.actions)) @api_doc(api_section.moderation) def GET_moderationlog(self, num, after, reverse, count, mod, action): @@ -413,6 +413,12 @@ class FrontController(RedditController): c.site.is_moderator(c.user)): return self.abort404() + if mod: + try: + mod = Account._by_name(mod, allow_deleted=True) + except NotFound: + mod = None + if isinstance(c.site, (MultiReddit, ModSR)): srs = Subreddit._byID(c.site.sr_ids, return_dict=False)