Added required tags. At least one such tag is needed to create a thread. All

other tags including new can be added is desired

boards/migrations/0004_tag_required.py

@@ -0,0 +1,20 b''
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0003_remove_tag_threads'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tag',
+            name='required',
+            field=models.BooleanField(default=False),
+            preserve_default=True,
+        ),
+    ]

boards/forms.py

@@ -8,7 +8,7 b' from django.utils.translation import uge'
 
 from boards.mdx_neboard import formatters
 from boards.models.post import TITLE_MAX_LENGTH
-from boards.models import PostImage
+from boards.models import PostImage, Tag
 from neboard import settings
 from boards import utils
 import boards.settings as board_settings
@@ -216,6 +216,17 b' class ThreadForm(PostForm):'
             raise forms.ValidationError(
                 _('Inappropriate characters in tags.'))
 
+        tag_models = []
+        required_tag_exists = False
+        for tag in tags.split():
+            tag_model = Tag.objects.filter(name=tag.strip().lower(),
+                    required=True)
+            if tag_model.exists():
+                required_tag_exists = True
+
+        if not required_tag_exists:
+            raise forms.ValidationError(_('Need at least 1 required tag.'))
+
         return tags
 
     def clean(self):

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: 2014-11-18 16:31+0200\n"
+"POT-Creation-Date: 2015-01-08 16:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -41,7 +41,7 b' msgstr ""'
 
 #: forms.py:23
 msgid "tag1 several_words_tag"
-msgstr "тег1 тег_из_нескольких_слов"
+msgstr "метка1 метка_из_нескольких_слов"
 
 #: forms.py:25
 msgid "Such image was already posted"
@@ -57,9 +57,9 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xba\xd1\x81\xd1\x82"'
 
 #: forms.py:29
 msgid "Tag"
-msgstr "Тег"
+msgstr "Метка"
 
-#: forms.py:30 templates/boards/base.html:40 templates/search/search.html:9
+#: forms.py:30 templates/boards/base.html:38 templates/search/search.html:9
 #: templates/search/search.html.py:13
 msgid "Search"
 msgstr "Поиск"
@@ -98,21 +98,25 b' msgstr "\xd0\x9f\xd0\xbe\xd0\xb4\xd0\xbe\xd0\xb6\xd0\xb4\xd0\xb8\xd1\x82\xd0\xb5 %s \xd1\x81\xd0\xb5\xd0\xba\xd1\x83\xd0\xbd\xd0\xb4 \xd0\xbf\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5 \xd0\xbf\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5\xd0\xb4\xd0\xbd\xd0\xb5\xd0\xb3\xd0\xbe \xd0\xbf\xd0\xbe\xd1\x81\xd1\x82\xd0\xb8\xd0\xbd\xd0\xb3\xd0\xb0"'
 
 #: forms.py:210 templates/boards/rss/post.html:10 templates/boards/tags.html:7
 msgid "Tags"
-msgstr "Теги"
+msgstr "Метки"
 
-#: forms.py:217 forms.py:243
+#: forms.py:217 forms.py:254
 msgid "Inappropriate characters in tags."
-msgstr "Недопустимые символы в тегах."
+msgstr "Недопустимые символы в метках."
 
-#: forms.py:230
+#: forms.py:228
+msgid "Need at least 1 required tag."
+msgstr "Нужна хотя бы 1 обязательная метка."
+
+#: forms.py:241
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:266
+#: forms.py:277
 msgid "Invalid master password"
 msgstr "Неверный мастер-пароль"
 
-#: forms.py:280
+#: forms.py:291
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
@@ -141,32 +145,32 b' msgstr "\xd0\xbb\xd0\xb8\xd1\x86\xd0\xb5\xd0\xbd\xd0\xb7\xd0\xb8\xd0\xb5\xd0\xb9"'
 msgid "Repository"
 msgstr "Репозиторий"
 
-#: templates/boards/base.html:16
+#: templates/boards/base.html:13
 msgid "Feed"
 msgstr "Лента"
 
-#: templates/boards/base.html:33
+#: templates/boards/base.html:30
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/boards/base.html:38
+#: templates/boards/base.html:36
 msgid "Tag management"
-msgstr "Управление тегами"
+msgstr "Управление метками"
 
-#: templates/boards/base.html:41 templates/boards/settings.html:7
+#: templates/boards/base.html:39 templates/boards/settings.html:7
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/boards/base.html:56
+#: templates/boards/base.html:52
 msgid "Admin"
 msgstr ""
 
-#: templates/boards/base.html:58
+#: templates/boards/base.html:54
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
-#: templates/boards/base.html:60
+#: templates/boards/base.html:56
 msgid "Up"
 msgstr "Вверх"
 
@@ -178,92 +182,96 b' msgstr "\xd0\x92\xd1\x85\xd0\xbe\xd0\xb4"'
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
-#: templates/boards/post.html:21 templates/boards/staticpages/help.html:17
+#: templates/boards/post.html:19 templates/boards/staticpages/help.html:17
 msgid "Quote"
 msgstr "Цитата"
 
-#: templates/boards/post.html:31
+#: templates/boards/post.html:27
 msgid "Open"
 msgstr "Открыть"
 
-#: templates/boards/post.html:33
+#: templates/boards/post.html:29
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/post.html:40
+#: templates/boards/post.html:36
 msgid "Edit"
 msgstr "Изменить"
 
-#: templates/boards/post.html:42
+#: templates/boards/post.html:39
 msgid "Edit thread"
 msgstr "Изменить тему"
 
-#: templates/boards/post.html:73
+#: templates/boards/post.html:71
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/post.html:83 templates/boards/thread.html:100
+#: templates/boards/post.html:79 templates/boards/thread.html:89
 #: templates/boards/thread_gallery.html:59
 msgid "messages"
 msgstr "сообщений"
 
-#: templates/boards/post.html:84 templates/boards/thread.html:101
+#: templates/boards/post.html:80 templates/boards/thread.html:90
 #: templates/boards/thread_gallery.html:60
 msgid "images"
 msgstr "изображений"
 
 #: templates/boards/post_admin.html:19
 msgid "Tags:"
-msgstr "Теги:"
+msgstr "Метки:"
 
 #: templates/boards/post_admin.html:30
 msgid "Add tag"
-msgstr "Добавить тег"
+msgstr "Добавить метку"
 
 #: templates/boards/posting_general.html:56
 msgid "Show tag"
-msgstr "Показывать тег"
+msgstr "Показывать метку"
 
 #: templates/boards/posting_general.html:60
 msgid "Hide tag"
-msgstr "Скрывать тег"
+msgstr "Скрывать метку"
 
-#: templates/boards/posting_general.html:79 templates/search/search.html:22
+#: templates/boards/posting_general.html:66
+msgid "Edit tag"
+msgstr "Изменить метку"
+
+#: templates/boards/posting_general.html:82 templates/search/search.html:22
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/posting_general.html:94
+#: templates/boards/posting_general.html:97
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/posting_general.html:121 templates/search/search.html:33
+#: templates/boards/posting_general.html:124 templates/search/search.html:33
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/posting_general.html:126
+#: templates/boards/posting_general.html:129
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/posting_general.html:132
+#: templates/boards/posting_general.html:135
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:137 templates/boards/preview.html:16
-#: templates/boards/thread.html:59
+#: templates/boards/posting_general.html:140 templates/boards/preview.html:16
+#: templates/boards/thread.html:54
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:142
+#: templates/boards/posting_general.html:145
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
-"Теги должны быть разделены пробелами. Текст или изображение обязательны."
+"Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:145 templates/boards/thread.html:67
+#: templates/boards/posting_general.html:148 templates/boards/thread.html:62
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:157
+#: templates/boards/posting_general.html:160
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -281,11 +289,11 b' msgstr "\xd0\x92\xd1\x8b \xd0\xbc\xd0\xbe\xd0\xb4\xd0\xb5\xd1\x80\xd0\xb0\xd1\x82\xd0\xbe\xd1\x80."'
 
 #: templates/boards/settings.html:19
 msgid "Hidden tags:"
-msgstr "Скрытые теги:"
+msgstr "Скрытые метки:"
 
 #: templates/boards/settings.html:26
 msgid "No hidden tags."
-msgstr "Нет скрытых тегов."
+msgstr "Нет скрытых меток."
 
 #: templates/boards/settings.html:35
 msgid "Save"
@@ -332,36 +340,31 b' msgstr "\xd0\x9a\xd0\xbe\xd0\xbc\xd0\xbc\xd0\xb5\xd0\xbd\xd1\x82\xd0\xb0\xd1\x80\xd0\xb8\xd0\xb9"'
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
-#: templates/boards/tags.html:22
+#: templates/boards/tags.html:23
 msgid "No tags found."
-msgstr "Теги не найдены."
+msgstr "Метки не найдены."
 
-#: templates/boards/thread.html:21 templates/boards/thread_gallery.html:19
+#: templates/boards/thread.html:19 templates/boards/thread_gallery.html:19
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
-#: templates/boards/thread.html:22 templates/boards/thread_gallery.html:20
+#: templates/boards/thread.html:20 templates/boards/thread_gallery.html:20
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
-#: templates/boards/thread.html:30
+#: templates/boards/thread.html:28
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
-#: templates/boards/thread.html:51
+#: templates/boards/thread.html:46
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:64
+#: templates/boards/thread.html:59
 msgid "Switch mode"
 msgstr "Переключить режим"
 
-#: templates/boards/thread.html:102 templates/boards/thread_gallery.html:61
+#: templates/boards/thread.html:91 templates/boards/thread_gallery.html:61
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
-#~ msgid "Delete"
-#~ msgstr "Удалить"
-
-#~ msgid "Ban IP"
-#~ msgstr "Заблокировать IP"

boards/models/base.py

@@ -6,5 +6,13 b' class Viewable():'
         pass
 
     def get_view(self, *args, **kwargs):
-        """Get an HTML view for a model"""
-        pass
  No newline at end of file
+        """
+        Gets an HTML view for a model
+        """
+        pass
+
+    def get_search_view(self, *args, **kwargs):
+        """
+        Gets an HTML view for search.
+        """
+        pass

boards/models/post.py

@@ -340,6 +340,9 b' class Post(models.Model, Viewable):'
             PARAMETER_OP_ID: opening_post_id,
         })
 
+    def get_search_view(self, *args, **kwargs):
+        return self.get_view(args, kwargs)
+
     def get_first_image(self) -> PostImage:
         return self.images.earliest('id')
 

boards/models/tag.py

@@ -18,7 +18,7 b' class TagManager(models.Manager):'
         """
 
         not_empty_tags = list()
-        tags = self.order_by('name')
+        tags = self.order_by('-required', 'name')
         for tag in tags:
             if tag.get_thread_count() > 0:
                 not_empty_tags.append(tag)
@@ -39,6 +39,7 b' class Tag(models.Model, Viewable):'
         ordering = ('name',)
 
     name = models.CharField(max_length=100, db_index=True)
+    required = models.BooleanField(default=False)
 
     def __str__(self):
         return self.name
@@ -73,10 +74,21 b' class Tag(models.Model, Viewable):'
     def get_url(self):
         return reverse('tag', kwargs={'tag_name': self.name})
 
-    def get_view(self, *args, **kwargs):
+    def get_threads(self):
+        return Thread.objects.filter(tags__in=[self]).order_by('-bump_time')
+
+    def is_required(self):
+        return self.required
+
+    def get_view(self):
+        #prefix = '##' if self.is_required() else '#'
+        link = '<a class="tag" href="{}">{}</a>'.format(
+                self.get_url(), self.name)
+        if self.is_required():
+            link = '<b>{}</b>'.format(link)
+        return link
+
+    def get_search_view(self, *args, **kwargs):
         return render_to_string('boards/tag.html', {
             'tag': self,
         })
-
-    def get_threads(self):
-        return Thread.objects.filter(tags__in=[self]).order_by('-bump_time')

boards/static/js/thread_update.js

@@ -312,7 +312,6 b' function processNewPost(post) {'
 }
 
 $(document).ready(function(){
-    if ('WebSocket' in window) {
         if (initAutoupdate()) {
             // Post form data over AJAX
             var threadId = $('div.thread').children('.post').first().attr('id');
@@ -323,7 +322,7 b' function processNewPost(post) {'
                 beforeSubmit: function(arr, $form, options) {
                     showAsErrors($('form'), gettext('Sending message...'));
                 },
-                success: updateOnPost,
+            success: getThreadDiff,
                 url: '/api/add_post/' + threadId + '/'
             };
 
@@ -331,5 +330,4 b' function processNewPost(post) {'
 
             resetForm(form);
         }
-    }
 });

boards/templates/boards/base.html

@@ -29,8 +29,9 b''
 <div class="navigation_panel header">
     <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
     {% for tag in tags %}
-        <a class="tag" href="{% url 'tag' tag_name=tag.name %}"
-                >#{{ tag.name }}</a>,
+        {% autoescape off %}
+            {{ tag.get_view }}{% if not forloop.last %},{% endif %}
+        {% endautoescape %}
     {% endfor %}
     <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
             >[...]</a>,

boards/templates/boards/post.html

@@ -81,8 +81,9 b''
         {% endif %}
         <span class="tags">
             {% for tag in thread.get_tags %}
-                <a class="tag" href="{% url 'tag' tag.name %}">
-                    #{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
+                {% autoescape off %}
+                    {{ tag.get_view }}{% if not forloop.last %},{% endif %}
+                {% endautoescape %}
             {% endfor %}
         </span>
     </div>

boards/templates/boards/posting_general.html

@@ -60,7 +60,10 b''
                    title="{% trans 'Hide tag' %}"
                    class="not_fav" rel="nofollow">H</a>
             {% endif %}
-            #{{ tag.name }}
+            {% autoescape off %}
+                {{ tag.get_view }}
+            {% endautoescape %}
+            [<a href="{% url 'admin:boards_tag_change' tag.id %}"$>{% trans 'Edit tag' %}</a>]
         </h2>
     </div>
 {% endif %}

boards/templates/boards/tag.html

@@ -1,3 +1,5 b''
 <div class="post">
-    <a class="tag" href="{% url 'tag' tag_name=tag.name %}">#{{ tag.name }}</a>
-</div>
  No newline at end of file
+    {% autoescape off %}
+        {{ tag.get_view }}
+    {% endautoescape %}
+</div>

boards/templates/boards/tags.html

@@ -14,8 +14,9 b''
         {% if all_tags %}
             {% for tag in all_tags %}
                 <div class="tag_item">
-                <a class="tag" href="{% url 'tag' tag.name %}">
-                #{{ tag.name }}</a>
+                    {% autoescape off %}
+                        {{ tag.get_view }}
+                    {% endautoescape %}
                 </div>
             {% endfor %}
         {% else %}

boards/templates/search/search.html

@@ -25,7 +25,7 b''
         {% endif %}
 
         {% for result in page.object_list %}
-            {{ result.object.get_view }}
+            {{ result.object.get_search_view }}
         {% endfor %}
 
         {% if page.has_next %}
@@ -35,4 +35,4 b''
             </div>
         {% endif %}
     {% endif %}
-{% endblock %}
  No newline at end of file
+{% endblock %}

boards/tests/test_forms.py

@@ -1,7 +1,7 b''
 from django.test import TestCase, Client
 import time
 from boards import settings
-from boards.models import Post
+from boards.models import Post, Tag
 import neboard
 
 
@@ -22,6 +22,7 b' class FormTest(TestCase):'
 
         valid_tags = 'tag1 tag_2 тег_3'
         invalid_tags = '$%_356 ---'
+        Tag.objects.create(name='tag1', required=True)
 
         response = client.post(NEW_THREAD_PAGE, {'title': 'test title',
                                                  'text': TEST_TEXT,

manage.py

@@ -1,4 +1,4 b''
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import os
 import sys