github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-25 23:08:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Read promoted link queries from UserQueryCache.

Browse Source
This commit is contained in:
bsimpson63
2012-10-25 15:29:21 -04:00
parent 31c3cbcd33
commit cac918e423
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -618,7 +618,7 @@ class UserController(ListingController):
q = queries.get_saved(self.vuser)
elif c.user_is_sponsor and self.where == 'promoted':
q = promote.get_all_links(self.vuser._id)
q = queries.get_promoted_links(self.vuser._id)
if q is None:
return self.abort404()

36
r2/r2/controllers/promotecontroller.py
View File

@@ -51,18 +51,30 @@ class PromoteController(ListingController):
return _('promoted by you')
def query(self):
author_id = None if c.user_is_sponsor else c.user._id
if self.sort == "future_promos":
return promote.get_unapproved_links(author_id)
elif self.sort == "pending_promos":
return promote.get_accepted_links(author_id)
elif self.sort == "unpaid_promos":
return promote.get_unpaid_links(author_id)
elif self.sort == "rejected_promos":
return promote.get_rejected_links(author_id)
elif self.sort == "live_promos":
return promote.get_live_links(author_id)
return promote.get_all_links(author_id)
if c.user_is_sponsor:
if self.sort == "future_promos":
return queries.get_all_unapproved_links()
elif self.sort == "pending_promos":
return queries.get_all_accepted_links()
elif self.sort == "unpaid_promos":
return queries.get_all_unpaid_links()
elif self.sort == "rejected_promos":
return queries.get_all_rejected_links()
elif self.sort == "live_promos":
return queries.get_all_live_links()
return queries.get_all_promoted_links()
else:
if self.sort == "future_promos":
return queries.get_unapproved_links(c.user._id)
elif self.sort == "pending_promos":
return queries.get_accepted_links(c.user._id)
elif self.sort == "unpaid_promos":
return queries.get_unpaid_links(c.user._id)
elif self.sort == "rejected_promos":
return queries.get_rejected_links(c.user._id)
elif self.sort == "live_promos":
return queries.get_live_links(c.user._id)
return queries.get_promoted_links(c.user._id)
@validate(VSponsor())
def GET_listing(self, sort = "", **env):