From 32359ee6b76f55ca5cfecb40ce0fb2951b77a09a Mon Sep 17 00:00:00 2001 From: Bryce Boe Date: Mon, 7 Jan 2013 17:14:50 -0800 Subject: [PATCH] Indicate failure when no moderator invite is found. --- r2/r2/controllers/api.py | 2 ++ r2/r2/lib/errors.py | 1 + 2 files changed, 3 insertions(+) diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index 3f6af6820..1ed095538 100755 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -725,6 +725,8 @@ class ApiController(RedditController, OAuth2ResourceController): @api_doc(api_section.subreddits) def POST_accept_moderator_invite(self, form, jquery, ip): if not c.site.remove_moderator_invite(c.user): + c.errors.add(errors.NO_INVITE_FOUND) + form.set_error(errors.NO_INVITE_FOUND, None) return ModAction.create(c.site, c.user, "acceptmoderatorinvite") diff --git a/r2/r2/lib/errors.py b/r2/r2/lib/errors.py index b25002810..ca13fe833 100644 --- a/r2/r2/lib/errors.py +++ b/r2/r2/lib/errors.py @@ -112,6 +112,7 @@ error_list = dict(( ('TOO_MANY_DEVELOPERS', _('too many developers')), ('BAD_HASH', _("i don't believe you.")), ('ALREADY_MODERATOR', _('that user is already a moderator')), + ('NO_INVITE_FOUND', _('there is no pending invite for that subreddit')), ('BID_LIVE', _('you cannot edit the bid of a live ad')), ('TOO_MANY_CAMPAIGNS', _('you have too many campaigns for that promotion')), ('BAD_JSONP_CALLBACK', _('that jsonp callback contains invalid characters')),