Show related tags in the tag page

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-10 10:22+0300\n"
+"POT-Creation-Date: 2015-08-12 18:32+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -111,7 +111,7 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xba\xd1\x81\xd1\x82 \xd0\xb8\xd0\xbb\xd0\xb8 \xd0\xba\xd0\xb0\xd1\x80\xd1\x82\xd0\xb8\xd0\xbd\xd0\xba\xd0\xb0 \xd0\xb4\xd0\xbe\xd0\xbb\xd0\xb6\xd0\xbd\xd1\x8b \xd0\xb1\xd1\x8b\xd1\x82\xd1\x8c \xd0\xb2\xd0\xb2\xd0\xb5\xd0\xb4\xd0\xb5\xd0\xbd\xd1\x8b."'
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:338 templates/boards/all_threads.html:141
+#: forms.py:338 templates/boards/all_threads.html:154
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:6
 msgid "Tags"
 msgstr "Метки"
@@ -156,62 +156,68 b' msgstr "\xd0\xad\xd1\x82\xd0\xbe\xd0\xb9 \xd1\x81\xd1\x82\xd1\x80\xd0\xb0\xd0\xbd\xd0\xb8\xd1\x86\xd1\x8b \xd0\xbd\xd0\xb5 \xd1\x81\xd1\x83\xd1\x89\xd0\xb5\xd1\x81\xd1\x82\xd0\xb2\xd1\x83\xd0\xb5\xd1\x82"'
 msgid "Related message"
 msgstr "Связанное сообщение"
 
-#: templates/boards/all_threads.html:68
+#: templates/boards/all_threads.html:71
 msgid "Edit tag"
 msgstr "Изменить метку"
 
-#: templates/boards/all_threads.html:76
+#: templates/boards/all_threads.html:79
 #, python-format
-#| msgid "This tag has %(thread_count)s threads and %(post_count)s posts."
 msgid ""
 "This tag has %(active_thread_count)s/%(thread_count)s threads and "
 "%(post_count)s posts."
-msgstr "С этой меткой есть %(active_thread_count)s/%(thread_count)s тем и %(post_count)s сообщений."
+msgstr ""
+"С этой меткой есть %(active_thread_count)s/%(thread_count)s тем и "
+"%(post_count)s сообщений."
 
-#: templates/boards/all_threads.html:83 templates/boards/feed.html:30
+#: templates/boards/all_threads.html:81
+#| msgid "Related message"
+msgid "Related tags:"
+msgstr "Похожие метки:"
+
+#: templates/boards/all_threads.html:96 templates/boards/feed.html:30
 #: templates/boards/notifications.html:17 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/all_threads.html:97
+#: templates/boards/all_threads.html:110
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/all_threads.html:115 templates/boards/feed.html:40
+#: templates/boards/all_threads.html:128 templates/boards/feed.html:40
 #: templates/boards/notifications.html:27 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/all_threads.html:120
+#: templates/boards/all_threads.html:133
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/all_threads.html:126
+#: templates/boards/all_threads.html:139
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/all_threads.html:131 templates/boards/preview.html:16
+#: templates/boards/all_threads.html:144 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:38
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/all_threads.html:136
+#: templates/boards/all_threads.html:149
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/all_threads.html:138 templates/boards/preview.html:6
+#: templates/boards/all_threads.html:151 templates/boards/preview.html:6
 #: templates/boards/staticpages/help.html:21
 #: templates/boards/thread_normal.html:42
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: templates/boards/all_threads.html:140 templates/boards/thread_normal.html:45
+#: templates/boards/all_threads.html:153 templates/boards/thread_normal.html:45
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/all_threads.html:154 templates/boards/feed.html:53
+#: templates/boards/all_threads.html:167 templates/boards/feed.html:53
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -391,15 +397,15 b' msgstr "\xd0\xa6\xd0\xb8\xd1\x82\xd0\xb0\xd1\x82\xd0\xb0"'
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
-#: templates/boards/tags.html:14
+#: templates/boards/tags.html:17
 msgid "Sections:"
 msgstr "Разделы:"
 
-#: templates/boards/tags.html:26
+#: templates/boards/tags.html:30
 msgid "Other tags:"
 msgstr "Другие метки:"
 
-#: templates/boards/tags.html:38
+#: templates/boards/tags.html:43
 msgid "All tags..."
 msgstr "Все метки..."
 

boards/models/tag.py

@@ -17,7 +17,7 b' class TagManager(models.Manager):'
         Gets tags that have non-archived threads.
         """
 
-        return self.annotate(num_threads=Count('thread')).filter(num_threads__gt=0)\
+        return self.annotate(num_threads=Count('thread_tags')).filter(num_threads__gt=0)\
             .order_by('-required', 'name')
 
     def get_tag_url_list(self, tags: list) -> str:
@@ -67,7 +67,7 b' class Tag(models.Model, Viewable):'
         return reverse('tag', kwargs={'tag_name': self.name})
 
     def get_threads(self):
-        return self.thread_set.order_by('-bump_time')
+        return self.thread_tags.order_by('-bump_time')
 
     def is_required(self):
         return self.required
@@ -100,3 +100,7 b' class Tag(models.Model, Viewable):'
 
     def get_first_letter(self):
         return self.name and self.name[0] or ''
+
+    def get_related_tags(self):
+        return Tag.objects.filter(thread_tags__in=self.get_threads()).exclude(
+                id=self.id).distinct()

boards/models/thread.py

@@ -65,7 +65,7 b' class Thread(models.Model):'
     class Meta:
         app_label = 'boards'
 
-    tags = models.ManyToManyField('Tag')
+    tags = models.ManyToManyField('Tag', related_name='thread_tags')
     bump_time = models.DateTimeField(db_index=True)
     last_edit_time = models.DateTimeField()
     archived = models.BooleanField(default=False)

boards/templates/boards/all_threads.html

@@ -77,6 +77,15 b''
                 {% endautoescape %}
             {% endif %}
             <p>{% blocktrans with active_thread_count=tag.get_active_thread_count thread_count=tag.get_thread_count post_count=tag.get_post_count %}This tag has {{ active_thread_count}}/{{ thread_count }} threads and {{ post_count }} posts.{% endblocktrans %}</p>
+            {% if related_tags %}
+                <p>{% trans 'Related tags:' %}
+                {% for rel_tag in related_tags %}
+                    {% autoescape off %}
+                    {{ rel_tag.get_view }}{% if not forloop.last %}, {% endif %}
+                    {% endautoescape %}
+                {% endfor %}
+                </p>
+            {% endif %}
         </div>
     </div>
 {% endif %}

boards/views/tag_threads.py

@@ -13,6 +13,8 b" 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'
+
 
 __author__ = 'neko259'
 
@@ -49,6 +51,7 b' class TagView(AllThreadsView, Dispatcher'
         params[PARAM_IS_HIDDEN] = hidden_tag_names is not None and tag.name in hidden_tag_names
 
         params[PARAM_RANDOM_IMAGE_POST] = tag.get_random_image_post()
+        params[PARAM_RELATED_TAGS] = tag.get_related_tags().all()
 
         return params