Added categories -- a redesign of old-style linked tags, a tree-based

structure

boards/migrations/0029_tag_parent.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0028_auto_20150928_2211'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tag',
+            name='parent',
+            field=models.ForeignKey(to='boards.Tag', null=True),
+        ),
+    ]

boards/migrations/0030_auto_20150929_1816.py

@@ -0,0 +1,19 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0029_tag_parent'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tag',
+            name='parent',
+            field=models.ForeignKey(related_name='children', null=True, to='boards.Tag'),
+        ),
+    ]

boards/forms.py

@@ -324,20 +324,27 b' class ThreadForm(PostForm):'
                 _('Inappropriate characters in tags.'))
 
         required_tag_exists = False
-        for tag in tags.split():
-            try:
-                Tag.objects.get(name=tag.strip().lower(), required=True)
+        tag_set = set()
+        for tag_string in tags.split():
+            tag, created = Tag.objects.get_or_create(name=tag_string.strip().lower())
+            tag_set.add(tag)
+
+            # If this is a new tag, don't check for its parents because nobody
+            # added them yet
+            if not created:
+                tag_set |= tag.get_all_parents()
+
+        for tag in tag_set:
+            if tag.required:
                 required_tag_exists = True
                 break
-            except ObjectDoesNotExist:
-                pass
 
         if not required_tag_exists:
             all_tags = Tag.objects.filter(required=True)
             raise forms.ValidationError(
                 _('Need at least one section.'))
 
-        return tags
+        return tag_set
 
     def clean(self):
         cleaned_data = super(ThreadForm, self).clean()

boards/locale/ru/LC_MESSAGES/django.po

@@ -483,4 +483,10 b' msgid "favorites"'
 msgstr "избранное"
 
 msgid "Loading..."
-msgstr "Загрузка..."
  No newline at end of file
+msgstr "Загрузка..."
+
+msgid "Category:"
+msgstr "Категория:"
+
+msgid "Subcategories:"
+msgstr "Подкатегории:"

boards/models/tag.py

@@ -48,6 +48,8 b' class Tag(models.Model, Viewable):'
     required = models.BooleanField(default=False, db_index=True)
     description = models.TextField(blank=True)
 
+    parent = models.ForeignKey('Tag', null=True, related_name='children')
+
     def __str__(self):
         return self.name
 
@@ -115,3 +117,18 b' class Tag(models.Model, Viewable):'
         Gets color hashed from the tag name.
         """
         return hashlib.md5(self.name.encode()).hexdigest()[:6]
+
+    def get_parent(self):
+        return self.parent
+
+    def get_all_parents(self):
+        parents = set()
+        parent = self.get_parent()
+        if parent and parent not in parents:
+            parents.add(parent)
+            parents |= parent.get_all_parents()
+
+        return parents
+
+    def get_children(self):
+        return self.children

boards/templates/boards/all_threads.html

@@ -73,13 +73,18 b''
                 <p>{{ tag.get_description|safe }}</p>
             {% 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 {{ thread_count }} threads ({{ active_thread_count}} active) and {{ post_count }} posts.{% endblocktrans %}</p>
-            {% if related_tags %}
-                <p>{% trans 'Related tags:' %}
-                {% for rel_tag in related_tags %}
-                    {{ rel_tag.get_view|safe }}{% if not forloop.last %}, {% else %}.{% endif %}
+            {% if tag.get_parent %}
+                <p>{% trans 'Category:' %} {{ tag.get_parent.get_view|safe }}</p>
+            {% endif %}
+            {% with children=tag.get_children.all %}
+            {% if children %}
+                <p>{% trans 'Subcategories:' %}
+                {% for child in children %}
+                {{ child.get_view|safe }}{% if not forloop.last %}, {% else %}.{% endif %}
                 {% endfor %}
                 </p>
             {% endif %}
+            {% endwith %}
         </div>
     </div>
 {% endif %}

boards/views/all_threads.py

@@ -104,24 +104,6 b' class AllThreadsView(PostMixin, BaseBoar'
         return reverse('index') + '?page=' \
                 + str(current_page.next_page_number())
 
-    @staticmethod
-    def parse_tags_string(tag_strings):
-        """
-        Parses tag list string and returns tag object list.
-        """
-
-        tags = []
-
-        if tag_strings:
-            tag_strings = tag_strings.split(TAG_DELIMITER)
-            for tag_name in tag_strings:
-                tag_name = tag_name.strip().lower()
-                if len(tag_name) > 0:
-                    tag, created = Tag.objects.get_or_create(name=tag_name)
-                    tags.append(tag)
-
-        return tags
-
     @transaction.atomic
     def create_thread(self, request, form: ThreadForm, html_response=True):
         """
@@ -146,9 +128,7 b' class AllThreadsView(PostMixin, BaseBoar'
 
         text = self._remove_invalid_links(text)
 
-        tag_strings = data[FORM_TAGS]
-
-        tags = self.parse_tags_string(tag_strings)
+        tags = data[FORM_TAGS]
 
         post = Post.objects.create_post(title=title, text=text, file=file,
                                         ip=ip, tags=tags, opening_posts=threads,