diff --git a/boards/models/post.py b/boards/models/post.py --- a/boards/models/post.py +++ b/boards/models/post.py @@ -291,7 +291,7 @@ class Post(models.Model): thread.last_edit_time = edit_time thread.save() - def get_url(self, opening_id=None): + def get_url(self): """ Get full url to this post """ @@ -300,9 +300,7 @@ class Post(models.Model): link = cache.get(cache_key) if not link: - if not opening_id: - opening_post = self.get_thread().get_opening_post() - opening_id = opening_post.id + opening_id = self.get_thread().get_opening_post_id() if self.id != opening_id: link = reverse('thread', kwargs={ diff --git a/boards/templates/boards/post.html b/boards/templates/boards/post.html --- a/boards/templates/boards/post.html +++ b/boards/templates/boards/post.html @@ -31,7 +31,7 @@
{{ post.title }} - + ({{ post.id }}) [{{ post.pub_time }}] {% if thread.archived %} @@ -73,7 +73,7 @@
{% trans "Replies" %}: {% for ref_post in refposts %} - >>{{ ref_post.id }}>>{{ ref_post.id }}{% if not forloop.last %},{% endif %} {% endfor %}
diff --git a/boards/templatetags/board.py b/boards/templatetags/board.py --- a/boards/templatetags/board.py +++ b/boards/templatetags/board.py @@ -20,25 +20,17 @@ actions = [ @register.simple_tag(name='post_url') def post_url(*args, **kwargs): post_id = args[0] - if len(args) > 1: - opening_post_id = args[1] - else: - opening_post_id = None post = get_object_or_404(Post, id=post_id) - return post.get_url(opening_post_id) + return post.get_url() @register.simple_tag(name='post_object_url') def post_object_url(*args, **kwargs): post = args[0] - if len(args) > 1: - opening_post_id = args[1] - else: - opening_post_id = None - return post.get_url(opening_post_id) + return post.get_url() @register.simple_tag(name='image_actions') @@ -78,10 +70,7 @@ def post_view(post, moderator=False, nee else: can_bump = thread.can_bump() - if 'opening_post_id' in kwargs: - opening_post_id = kwargs['opening_post_id'] - else: - opening_post_id = thread.get_opening_post().id + opening_post_id = thread.get_opening_post_id() return { 'post': post,