mirror of
https://github.com/reddit-archive/reddit.git
synced 2026-01-29 00:38:11 -05:00
Fix discussion page's "limit", "after", "reverse", "count" params.
This commit is contained in:
@@ -764,8 +764,9 @@ class FrontController(RedditController, OAuth2ResourceController):
|
||||
|
||||
# only look up duplicates if it's not a self-post
|
||||
if not getattr(article, 'is_self', False):
|
||||
builder = url_links_builder(article.url,
|
||||
exclude=article._fullname)
|
||||
builder = url_links_builder(article.url, exclude=article._fullname,
|
||||
num=num, after=after, reverse=reverse,
|
||||
count=count)
|
||||
num_duplicates = len(builder.get_items()[0])
|
||||
listing = LinkListing(builder).listing()
|
||||
else:
|
||||
|
||||
@@ -225,7 +225,8 @@ class WikiController(RedditController):
|
||||
@validate(page=VWikiPage('page', restricted=True))
|
||||
def GET_wiki_discussions(self, page, num, after, reverse, count):
|
||||
page_url = add_sr("%s/%s" % (c.wiki_base_url, page.name))
|
||||
builder = url_links_builder(page_url)
|
||||
builder = url_links_builder(page_url, num=num, after=after,
|
||||
reverse=reverse, count=count)
|
||||
listing = LinkListing(builder).listing()
|
||||
return WikiDiscussions(listing, page=page.name,
|
||||
may_revise=this_may_revise(page)).render()
|
||||
|
||||
@@ -1028,7 +1028,8 @@ def filter_links(links, filter_spam = False, multiple = True):
|
||||
# among those, show them the hottest one
|
||||
return links if multiple else links[0]
|
||||
|
||||
def url_links_builder(url, exclude=None):
|
||||
def url_links_builder(url, exclude=None, num=None, after=None, reverse=None,
|
||||
count=None):
|
||||
from r2.models import IDBuilder, Link, NotFound
|
||||
from operator import attrgetter
|
||||
|
||||
@@ -1050,8 +1051,9 @@ def url_links_builder(url, exclude=None):
|
||||
c.user_is_admin or
|
||||
link.subreddit.is_moderator(c.user))))
|
||||
|
||||
builder = IDBuilder([link._fullname for link in links],
|
||||
skip=True, keep_fn=include_link)
|
||||
builder = IDBuilder([link._fullname for link in links], skip=True,
|
||||
keep_fn=include_link, num=num, after=after,
|
||||
reverse=reverse, count=count)
|
||||
|
||||
return builder
|
||||
|
||||
|
||||
Reference in New Issue
Block a user