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

Rename "moderateflair" oauth2 scope to "modflair".

Browse Source
This commit is contained in:
Logan Hanks
2012-09-14 13:41:34 -07:00
parent 808ae9bd25
commit 342b085f2c
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2270,7 +2270,7 @@ class ApiController(RedditController, OAuth2ResourceController):
award._commit()
form.set_html(".status", _('saved'))
@require_oauth2_scope("moderateflair")
@require_oauth2_scope("modflair")
@validatedForm(VFlairManager(),
VModhash(),
user = VFlairAccount("name"),
@@ -2344,7 +2344,7 @@ class ApiController(RedditController, OAuth2ResourceController):
jquery('input[name="css_class"]').data('saved', css_class)
form.set_html('.status', _('saved'))
@require_oauth2_scope("moderateflair")
@require_oauth2_scope("modflair")
@validatedForm(VFlairManager(),
VModhash(),
user = VFlairAccount("name"))
@@ -2366,7 +2366,7 @@ class ApiController(RedditController, OAuth2ResourceController):
user, include_flair_selector=True).render(style='html')
jquery('.tagline .id-%s' % user._fullname).parent().html(unflair)
@require_oauth2_scope("moderateflair")
@require_oauth2_scope("modflair")
@validate(VFlairManager(),
VModhash(),
flair_csv = nop('flair_csv'))
@@ -2434,7 +2434,7 @@ class ApiController(RedditController, OAuth2ResourceController):
return BoringPage(_("API"), content = results).render()
@require_oauth2_scope("moderateflair")
@require_oauth2_scope("modflair")
@validatedForm(VUser(),
VModhash(),
flair_enabled = VBoolean("flair_enabled"))
@@ -2444,7 +2444,7 @@ class ApiController(RedditController, OAuth2ResourceController):
c.user._commit()
jquery.refresh()
@require_oauth2_scope("moderateflair")
@require_oauth2_scope("modflair")
@validatedForm(
VFlairManager(),
VModhash(),
@@ -2484,7 +2484,7 @@ class ApiController(RedditController, OAuth2ResourceController):
c.site._commit()
jquery.refresh()
@require_oauth2_scope("moderateflair")
@require_oauth2_scope("modflair")
@paginated_listing(max_page_size=1000)
@validate(user = VFlairAccount('name'))
@api_doc(api_section.flair)
@@ -2492,7 +2492,7 @@ class ApiController(RedditController, OAuth2ResourceController):
flair = FlairList(num, after, reverse, '', user)
return BoringPage(_("API"), content = flair).render()
@require_oauth2_scope("moderateflair")
@require_oauth2_scope("modflair")
@validatedForm(VFlairManager(),
VModhash(),
flair_template = VFlairTemplateByID('flair_template_id'),
@@ -2562,7 +2562,7 @@ class ApiController(RedditController, OAuth2ResourceController):
ModAction.create(c.site, c.user, action='editflair',
details='flair_template')
@require_oauth2_scope("moderateflair")
@require_oauth2_scope("modflair")
@validatedForm(VFlairManager(),
VModhash(),
flair_template = VFlairTemplateByID('flair_template_id'))
@@ -2574,7 +2574,7 @@ class ApiController(RedditController, OAuth2ResourceController):
ModAction.create(c.site, c.user, action='editflair',
details='flair_delete_template')
@require_oauth2_scope("moderateflair")
@require_oauth2_scope("modflair")
@validatedForm(VFlairManager(), VModhash(),
flair_type = VOneOf('flair_type', (USER_FLAIR, LINK_FLAIR),
default=USER_FLAIR))

7
r2/r2/models/token.py
View File

@@ -101,10 +101,11 @@ class OAuth2Scope:
"name": _("My Identity"),
"description": _("Access my reddit username and signup date."),
},
"moderateflair": {
"id": "moderateflair",
"modflair": {
"id": "modflair",
"name": _("Moderating Flair"),
"description": _("Manage flair in subreddits I moderate."),
"description": _(
"Manage and assign flair in subreddits I moderate."),
},
"mysubreddits": {
"id": "mysubreddits",