Slightly changed and optimized tag thread counters

boards/templates/boards/all_threads.html

@@ -1,162 +1,152 b''
 {% extends "boards/paginated.html" %}
 
 {% load i18n %}
 {% load board %}
 {% load static %}
 {% load tz %}
 
 {% block head %}
     <meta name="robots" content="noindex">
 
     {% if tag %}
         <title>{{ tag.get_localized_name }} - {{ site_name }}</title>
     {% else %}
         <title>{{ site_name }}</title>
     {% endif %}
 
     {% if prev_page_link %}
         <link rel="prev" href="{{ prev_page_link|safe }}" />
     {% endif %}
     {% if next_page_link %}
         <link rel="next" href="{{ next_page_link|safe }}" />
     {% endif %}
 
 {% endblock %}
 
 {% block content %}
 
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
     {% for banner in banners %}
         <div class="post">
             <div class="title">{{ banner.title }}</div>
             <div>{{ banner.get_text|safe }}</div>
             <div>{% trans 'Details' %}: <a href="{{ banner.post.get_absolute_url|safe }}">>>{{ banner.post.id }}</a></div>
         </div>
     {% endfor %}
 
 {% if tag %}
     <div class="tag_info" style="border: solid .5ex #{{ tag.get_color }}">
         {% if random_image_post %}
             <div class="tag-image">
                 {% with image=random_image_post.get_first_image %}
                     <a href="{{ random_image_post.get_absolute_url|safe }}"><img
                         src="{{ image.get_thumb_url|safe }}"
                         width="{{ image.get_preview_size.0 }}"
                         height="{{ image.get_preview_size.1 }}"
                         alt="{{ random_image_post.id }}"/></a>
                 {% endwith %}
             </div>
         {% endif %}
         <div class="tag-text-data">
             <h2>
                 /{{ tag.get_view|safe }}/
             </h2>
             {% if perms.change_tag %}
                 <div class="moderator_info"><a href="{% url 'admin:boards_tag_change' tag.id %}">{% trans 'Edit tag' %}</a></div>
             {% endif %}
             <p>
                 <form action="{% url 'tag' tag.get_name %}" method="post" class="post-button-form">
                     {% if is_favorite %}
                         <button name="method" value="unsubscribe" class="fav">★ {% trans "Remove from favorites" %}</button>
                     {% else %}
                         <button name="method" value="subscribe" class="not_fav">★ {% trans "Add to favorites" %}</button>
                     {% endif %}
                 </form>
                 &bull;
                 <form action="{% url 'tag' tag.get_name %}" method="post" class="post-button-form">
                     {% if is_hidden %}
                         <button name="method" value="unhide" class="fav">{% trans "Show" %}</button>
                     {% else %}
                         <button name="method" value="hide" class="not_fav">{% trans "Hide" %}</button>
                     {% endif %}
                 </form>
                 &bull;
                 <a href="{% url 'tag_gallery' tag.get_name %}">{% trans 'Gallery' %}</a>
             </p>
             {% if tag.get_description %}
                 <p>{{ tag.get_description|safe }}</p>
             {% endif %}
             <p>
-                {% with active_count=tag.get_active_thread_count bumplimit_count=tag.get_bumplimit_thread_count archived_count=tag.get_archived_thread_count %}
-                    {% if active_count %}
-                        ● {{ active_count }}&ensp;
-                    {% endif %}
-                    {% if bumplimit_count %}
-                        ◍ {{ bumplimit_count }}&ensp;
-                    {% endif %}
-                    {% if archived_count %}
-                        ○ {{ archived_count }}&ensp;
-                    {% endif %}
-                {% endwith %}
+                ● {{ tag_thread_count_active }} + {{ tag_thread_count_bumplimit }} + {{ tag_thread_count_archive }} = {{ tag_thread_count }}<br/>
                 ♥ {{ tag.get_post_count }}
             </p>
             {% if tag.get_all_parents %}
                 <p>
                     {% for parent in tag.get_all_parents %}
                         {{ parent.get_view|safe }} &gt;
                     {% endfor %}
                     {{ tag.get_view|safe }}
                 </p>
             {% endif %}
             {% if tag.get_children.all %}
                 <p>
                 {% trans "Subsections: " %}
                 {% for child in tag.get_children.all %}
                     {{ child.get_view|safe }}{% if not forloop.last%}, {% endif %}
                 {% endfor %}
                 </p>
             {% endif %}
         </div>
     </div>
 {% endif %}
 
     {% if threads %}
         {% if prev_page_link %}
             <div class="page_link">
                 <a href="{{ prev_page_link }}">&lt;&lt; {% trans "Previous page" %} &lt;&lt;</a>
             </div>
         {% endif %}
 
         {% for thread in threads %}
             <div class="thread">
                 {% post_view thread.get_opening_post thread=thread truncated=True need_open_link=True %}
                 {% if not thread.archived %}
                     {% with last_replies=thread.get_last_replies %}
                         {% if last_replies %}
                             {% with skipped_replies_count=thread.get_skipped_replies_count %}
                                 {% if skipped_replies_count %}
                                     <div class="skipped_replies">
                                         <a href="{% url 'thread' thread.get_opening_post_id %}">
                                             {% blocktrans count count=skipped_replies_count %}Skipped {{ count }} reply. Open thread to see all replies.{% plural %}Skipped {{ count }} replies. Open thread to see all replies.{% endblocktrans %}
                                         </a>
                                     </div>
                                 {% endif %}
                             {% endwith %}
                             <div class="last-replies">
                                 {% for post in last_replies %}
                                     {% post_view post truncated=True %}
                                 {% endfor %}
                             </div>
                         {% endif %}
                     {% endwith %}
                 {% endif %}
             </div>
         {% endfor %}
 
         {% if next_page_link %}
             <div class="page_link">
                 <a href="{{ next_page_link }}">&gt;&gt; {% trans "Next page" %} &gt;&gt;</a>
             </div>
         {% endif %}
     {% else %}
         <div class="post">
             {% trans 'No threads exist. Create the first one!' %}</div>
     {% endif %}
 
     {% form_view form=form new_thread=True %}
 
     <script src="{% static 'js/thread_create.js' %}"></script>
 
 {% endblock %}

boards/views/tag_threads.py

@@ -1,121 +1,135 b''
 from django.shortcuts import get_object_or_404, redirect, get_list_or_404
 from django.urls import reverse
 
 from boards.abstracts.settingsmanager import get_settings_manager, \
         SETTING_FAVORITE_TAGS, SETTING_HIDDEN_TAGS
 from boards.models import Tag, TagAlias, Post
 from boards.views.all_threads import AllThreadsView
 from boards.views.mixins import DispatcherMixin, PARAMETER_METHOD
 from boards.forms import ThreadForm, PlainErrorList
 
 PARAM_HIDDEN_TAGS = 'hidden_tags'
 PARAM_TAG = 'tag'
 PARAM_IS_FAVORITE = 'is_favorite'
 PARAM_IS_HIDDEN = 'is_hidden'
 PARAM_RANDOM_IMAGE_POST = 'random_image_post'
 PARAM_RELATED_TAGS = 'related_tags'
+PARAM_THREAD_COUNT = 'tag_thread_count'
+PARAM_THREAD_COUNT_ACTIVE = 'tag_thread_count_active'
+PARAM_THREAD_COUNT_BUMPLIMIT = 'tag_thread_count_bumplimit'
+PARAM_THREAD_COUNT_ARCHIVE = 'tag_thread_count_archive'
 
 
 __author__ = 'neko259'
 
 
 class TagView(AllThreadsView, DispatcherMixin):
 
     tag_name = None
 
     def get_threads(self):
         tag_alias = get_object_or_404(TagAlias, name=self.tag_name)
         tag = tag_alias.parent
 
         hidden_tags = list(self.settings_manager.get_hidden_tags())
 
         try:
             hidden_tags.remove(tag)
         except ValueError:
             pass
 
         return tag.get_threads().exclude(
             tags__in=hidden_tags)
 
     def get_context_data(self, **kwargs):
         params = super(TagView, self).get_context_data(**kwargs)
 
         settings_manager = get_settings_manager(kwargs['request'])
 
         tag_alias = get_list_or_404(TagAlias, name=self.tag_name)[0]
         tag = tag_alias.parent
         params[PARAM_TAG] = tag
 
         params[PARAM_IS_FAVORITE] = settings_manager.tag_is_fav(tag)
         params[PARAM_IS_HIDDEN] = settings_manager.tag_is_hidden(tag)
 
         params[PARAM_RANDOM_IMAGE_POST] = tag.get_random_image_post()
         params[PARAM_RELATED_TAGS] = tag.get_related_tags()
 
+        active_count = tag.get_active_thread_count()
+        bumplimit_count = tag.get_bumplimit_thread_count()
+        archive_count = tag.get_archived_thread_count()
+        total_count = active_count + bumplimit_count + archive_count
+
+        params[PARAM_THREAD_COUNT_ACTIVE] = active_count
+        params[PARAM_THREAD_COUNT_BUMPLIMIT] = bumplimit_count
+        params[PARAM_THREAD_COUNT_ARCHIVE] = archive_count
+        params[PARAM_THREAD_COUNT] = total_count
+
         return params
 
     def get_reverse_url(self):
         return reverse('tag', kwargs={'tag_name': self.tag_name})
 
     def get(self, request, tag_name, form=None):
         self.tag_name = tag_name
 
         return super(TagView, self).get(request, form)
 
 
     def post(self, request, tag_name):
         self.tag_name = tag_name
 
         if PARAMETER_METHOD in request.POST:
             self.dispatch_method(request)
 
             return redirect('tag', tag_name)
         else:
             form = ThreadForm(request.POST, request.FILES,
                               error_class=PlainErrorList,
                               session=request.session)
 
             if form.is_valid():
                 return Post.objects.create_from_form(request, form, opening_post=None)
             if form.need_to_ban:
                 # Ban user because he is suspected to be a bot
                 self._ban_current_user(request)
 
             return self.get(request, tag_name, form)
 
     def subscribe(self, request):
         alias = get_object_or_404(TagAlias, name=self.tag_name)
         tag = alias.parent
 
         settings_manager = get_settings_manager(request)
         settings_manager.add_fav_tag(tag)
 
     def unsubscribe(self, request):
         alias = get_object_or_404(TagAlias, name=self.tag_name)
         tag = alias.parent
 
         settings_manager = get_settings_manager(request)
         settings_manager.del_fav_tag(tag)
 
     def hide(self, request):
         """
         Adds tag to user's hidden tags. Threads with this tag will not be
         shown.
         """
 
         alias = get_object_or_404(TagAlias, name=self.tag_name)
         tag = alias.parent
 
         settings_manager = get_settings_manager(request)
         settings_manager.add_hidden_tag(tag)
 
     def unhide(self, request):
         """
         Removed tag from user's hidden tags.
         """
 
         alias = get_object_or_404(TagAlias, name=self.tag_name)
         tag = alias.parent
 
         settings_manager = get_settings_manager(request)
         settings_manager.del_hidden_tag(tag)