github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-29 00:38:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Accept data parameter for multi sr data PUTs.

Browse Source
This commit is contained in:
Brian Simpson
2013-07-09 12:16:56 -07:00
committed by Max Goodman
parent df03e621c0
commit 5ae42365af
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
r2/r2/controllers/multi.py
View File

@@ -70,6 +70,9 @@ multi_description_json_spec = {
}
multi_sr_data_json_spec = {}
class MultiApiController(RedditController, OAuth2ResourceController):
def pre(self):
set_extension(request.environ, "json")
@@ -293,8 +296,9 @@ class MultiApiController(RedditController, OAuth2ResourceController):
VModhash(),
multi=VMultiByPath("multipath", require_edit=True),
sr=VSRByName('srname'),
data=VValidatedJSON("model", multi_sr_data_json_spec),
)
def PUT_multi_subreddit(self, multi, sr):
def PUT_multi_subreddit(self, multi, sr, data):
"""Add a subreddit to a multi."""
if isinstance(sr, FakeSubreddit):
@@ -303,9 +307,8 @@ class MultiApiController(RedditController, OAuth2ResourceController):
code=400)
new = sr not in multi._srs
try:
multi.add_srs({sr: {}})
multi.add_srs({sr: data})
except TooManySubredditsError as e:
raise RedditError('MULTI_TOO_MANY_SUBREDDITS', code=409)
else: