github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-26 15:28:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

UserController can filter saves by subreddit.

Browse Source
This commit is contained in:
bsimpson63
2012-08-19 01:43:41 -04:00
parent 858c7c264a
commit 54d6ae3ef7
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
r2/r2/controllers/listingcontroller.py
View File

@@ -546,6 +546,20 @@ class UserController(ListingController):
res.append(ProfileSortMenu(default = self.sort))
if self.sort not in ("hot", "new"):
res.append(TimeMenu(default = self.time))
if self.where == 'saved' and c.user.gold:
srnames = LinkSavesBySubreddit.get_saved_subreddits(self.vuser)
srnames += CommentSavesBySubreddit.get_saved_subreddits(self.vuser)
srnames = sorted(list(set(srnames)))
if len(srnames) > 1:
sr_buttons = [NavButton(_('all'), None, opt='sr',
css_class='primary')]
for srname in srnames:
sr_buttons.append(NavButton(srname, srname, opt='sr'))
base_path = request.path
sr_menu = NavMenu(sr_buttons, base_path=base_path,
title=_('filter by subreddit'),
type='lightdrop')
res.append(sr_menu)
return res
def title(self):
@@ -615,7 +629,15 @@ class UserController(ListingController):
q = queries.get_hidden(self.vuser)
elif self.where == 'saved':
q = queries.get_saved(self.vuser)
srname = request.get.get('sr')
if srname and c.user.gold:
try:
sr_id = Subreddit._by_name(srname)._id
except NotFound:
sr_id = None
else:
sr_id = None
q = queries.get_saved(self.vuser, sr_id)
elif c.user_is_sponsor and self.where == 'promoted':
q = queries.get_promoted_links(self.vuser._id)