Add 'other discussions' tab for self-posts

Shows submissions linking to the self-post
This commit is contained in:
Chad Birch
2013-06-13 16:28:22 -06:00
parent 61a1c77f1c
commit 8d20462115
3 changed files with 10 additions and 11 deletions

View File

@@ -759,16 +759,11 @@ class FrontController(RedditController, OAuth2ResourceController):
if not can_view_link_comments(article):
abort(403, 'forbidden')
# 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,
num=num, after=after, reverse=reverse,
count=count)
num_duplicates = len(builder.get_items()[0])
listing = LinkListing(builder).listing()
else:
num_duplicates = 0
listing = None
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()
res = LinkInfoPage(link=article,
comment=None,

View File

@@ -1167,7 +1167,7 @@ class LinkInfoPage(Reddit):
buttons.extend([info_button('comments'),
info_button('related')])
if not self.link.is_self and self.num_duplicates > 0:
if self.num_duplicates > 0:
buttons.append(info_button('duplicates', num=self.num_duplicates))
if c.user_is_admin:

View File

@@ -1030,9 +1030,13 @@ def filter_links(links, filter_spam = False, multiple = True):
def url_links_builder(url, exclude=None, num=None, after=None, reverse=None,
count=None):
from r2.lib.template_helpers import add_sr
from r2.models import IDBuilder, Link, NotFound
from operator import attrgetter
if url.startswith('/'):
url = add_sr(url, force_hostname=True)
try:
links = tup(Link._by_url(url, None))
except NotFound: