Merged with default branch

boards/models/post/__init__.py

@@ -7,7 +7,6 b' from boards.models import PostImage, Att'
 from boards.models.base import Viewable
 from boards.models.post.export import get_exporter, DIFF_TYPE_JSON
 from boards.models.post.manager import PostManager
-from boards.utils import cached_result
 from boards.utils import datetime_to_epoch
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
@@ -176,10 +175,6 b' class Post(models.Model, Viewable):'
     def _get_cache_key(self):
         return [datetime_to_epoch(self.last_edit_time)]
 
-    @cached_result(key_method=_get_cache_key)
-    def get_thread_count(self):
-        return self.get_threads().count()
-
     def get_view(self, *args, **kwargs) -> str:
         """
         Renders post's HTML view. Some of the post params can be passed over
@@ -353,17 +348,6 b' class Post(models.Model, Viewable):'
 
         return text
 
-    def get_absolute_id(self) -> str:
-        """
-        If the post has many threads, shows its main thread OP id in the post
-        ID.
-        """
-
-        if self.get_thread_count() > 1:
-            return '{}/{}'.format(self.get_thread().get_opening_post_id(), self.id)
-        else:
-            return str(self.id)
-
     def connect_threads(self, opening_posts):
         for opening_post in opening_posts:
             threads = opening_post.get_threads().all()

boards/templates/boards/post.html

@@ -5,7 +5,7 b''
 
 <div class="{{ css_class }}" id="{{ post.id }}" data-uid="{{ post.uid }}" {% if tree_depth %}style="margin-left: {{ tree_depth }}em;"{% endif %}>
     <div class="post-info">
-        <a class="post_id" href="{{ post.get_absolute_url }}">#{{ post.get_absolute_id }}</a>
+        <a class="post_id" href="{{ post.get_absolute_url }}">#{{ post.id }}</a>
         <span class="title">{{ post.title }}</span>
         <span class="pub_time"><time datetime="{{ post.pub_time|date:'c' }}">{{ post.pub_time }}</time></span>
         {% if post.tripcode %}