Show the list of required tags when non was entered at thread creation

boards/forms.py

@@ -1,369 +1,372 b''
 import re
 import time
 import pytz
 
 from django import forms
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.core.exceptions import ObjectDoesNotExist
 from django.forms.util import ErrorList
 from django.utils.translation import ugettext_lazy as _
 import requests
 
 from boards.mdx_neboard import formatters
 from boards.models.post import TITLE_MAX_LENGTH
 from boards.models import Tag, Post
 from neboard import settings
 import boards.settings as board_settings
 
 
 CONTENT_TYPE_IMAGE = (
     'image/jpeg',
     'image/png',
     'image/gif',
     'image/bmp',
 )
 
 REGEX_TAGS = re.compile(r'^[\w\s\d]+$', re.UNICODE)
 
 VETERAN_POSTING_DELAY = 5
 
 ATTRIBUTE_PLACEHOLDER = 'placeholder'
 ATTRIBUTE_ROWS = 'rows'
 
 LAST_POST_TIME = 'last_post_time'
 LAST_LOGIN_TIME = 'last_login_time'
 TEXT_PLACEHOLDER = _('Type message here. Use formatting panel for more advanced usage.')
 TAGS_PLACEHOLDER = _('music images i_dont_like_tags')
 
 LABEL_TITLE = _('Title')
 LABEL_TEXT = _('Text')
 LABEL_TAG = _('Tag')
 LABEL_SEARCH = _('Search')
 
 TAG_MAX_LENGTH = 20
 
 IMAGE_DOWNLOAD_CHUNK_BYTES = 100000
 
 HTTP_RESULT_OK = 200
 
 TEXTAREA_ROWS = 4
 
 
 def get_timezones():
     timezones = []
     for tz in pytz.common_timezones:
         timezones.append((tz, tz),)
     return timezones
 
 
 class FormatPanel(forms.Textarea):
     """
     Panel for text formatting. Consists of buttons to add different tags to the
     form text area.
     """
 
     def render(self, name, value, attrs=None):
         output = '<div id="mark-panel">'
         for formatter in formatters:
             output += '<span class="mark_btn"' + \
                       ' onClick="addMarkToMsg(\'' + formatter.format_left + \
                       '\', \'' + formatter.format_right + '\')">' + \
                       formatter.preview_left + formatter.name + \
                       formatter.preview_right + '</span>'
 
         output += '</div>'
         output += super(FormatPanel, self).render(name, value, attrs=None)
 
         return output
 
 
 class PlainErrorList(ErrorList):
     def __unicode__(self):
         return self.as_text()
 
     def as_text(self):
         return ''.join(['(!) %s ' % e for e in self])
 
 
 class NeboardForm(forms.Form):
     """
     Form with neboard-specific formatting.
     """
 
     def as_div(self):
         """
         Returns this form rendered as HTML <as_div>s.
         """
 
         return self._html_output(
             # TODO Do not show hidden rows in the list here
             normal_row='<div class="form-row"><div class="form-label">'
                        '%(label)s'
                        '</div></div>'
                        '<div class="form-row"><div class="form-input">'
                        '%(field)s'
                        '</div></div>'
                        '<div class="form-row">'
                        '%(help_text)s'
                        '</div>',
             error_row='<div class="form-row">'
                       '<div class="form-label"></div>'
                       '<div class="form-errors">%s</div>'
                       '</div>',
             row_ender='</div>',
             help_text_html='%s',
             errors_on_separate_row=True)
 
     def as_json_errors(self):
         errors = []
 
         for name, field in list(self.fields.items()):
             if self[name].errors:
                 errors.append({
                     'field': name,
                     'errors': self[name].errors.as_text(),
                 })
 
         return errors
 
 
 class PostForm(NeboardForm):
 
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
                             label=LABEL_TITLE)
     text = forms.CharField(
         widget=FormatPanel(attrs={
             ATTRIBUTE_PLACEHOLDER: TEXT_PLACEHOLDER,
             ATTRIBUTE_ROWS: TEXTAREA_ROWS,
         }),
         required=False, label=LABEL_TEXT)
     image = forms.ImageField(required=False, label=_('Image'),
                              widget=forms.ClearableFileInput(
                                  attrs={'accept': 'image/*'}))
     image_url = forms.CharField(required=False, label=_('Image URL'),
                                 widget=forms.TextInput(
                                     attrs={ATTRIBUTE_PLACEHOLDER:
                                                'http://example.com/image.png'}))
 
     # This field is for spam prevention only
     email = forms.CharField(max_length=100, required=False, label=_('e-mail'),
                             widget=forms.TextInput(attrs={
                                 'class': 'form-email'}))
     threads = forms.CharField(required=False, label=_('Additional threads'),
             widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER:
                 '123 456 789'}))
 
     session = None
     need_to_ban = False
 
     def clean_title(self):
         title = self.cleaned_data['title']
         if title:
             if len(title) > TITLE_MAX_LENGTH:
                 raise forms.ValidationError(_('Title must have less than %s '
                                               'characters') %
                                             str(TITLE_MAX_LENGTH))
         return title
 
     def clean_text(self):
         text = self.cleaned_data['text'].strip()
         if text:
             if len(text) > board_settings.MAX_TEXT_LENGTH:
                 raise forms.ValidationError(_('Text must have less than %s '
                                               'characters') %
                                             str(board_settings
                                             .MAX_TEXT_LENGTH))
         return text
 
     def clean_image(self):
         image = self.cleaned_data['image']
 
         if image:
             self.validate_image_size(image.size)
 
         return image
 
     def clean_image_url(self):
         url = self.cleaned_data['image_url']
 
         image = None
         if url:
             image = self._get_image_from_url(url)
 
             if not image:
                 raise forms.ValidationError(_('Invalid URL'))
             else:
                 self.validate_image_size(image.size)
 
         return image
 
     def clean_threads(self):
         threads_str = self.cleaned_data['threads']
 
         if len(threads_str) > 0:
             threads_id_list = threads_str.split(' ')
 
             threads = list()
 
             for thread_id in threads_id_list:
                 try:
                     thread = Post.objects.get(id=int(thread_id))
                     if not thread.is_opening():
                         raise ObjectDoesNotExist()
                     threads.append(thread)
                 except (ObjectDoesNotExist, ValueError):
                     raise forms.ValidationError(_('Invalid additional thread list'))
 
             return threads
 
     def clean(self):
         cleaned_data = super(PostForm, self).clean()
 
         if not self.session:
             raise forms.ValidationError('Humans have sessions')
 
         if cleaned_data['email']:
             self.need_to_ban = True
             raise forms.ValidationError('A human cannot enter a hidden field')
 
         if not self.errors:
             self._clean_text_image()
 
         if not self.errors and self.session:
             self._validate_posting_speed()
 
         return cleaned_data
 
     def get_image(self):
         """
         Gets image from file or URL.
         """
 
         image = self.cleaned_data['image']
         return image if image else self.cleaned_data['image_url']
 
     def _clean_text_image(self):
         text = self.cleaned_data.get('text')
         image = self.get_image()
 
         if (not text) and (not image):
             error_message = _('Either text or image must be entered.')
             self._errors['text'] = self.error_class([error_message])
 
     def _validate_posting_speed(self):
         can_post = True
 
         posting_delay = settings.POSTING_DELAY
 
         if board_settings.LIMIT_POSTING_SPEED and LAST_POST_TIME in \
                 self.session:
             now = time.time()
             last_post_time = self.session[LAST_POST_TIME]
 
             current_delay = int(now - last_post_time)
 
             if current_delay < posting_delay:
                 error_message = _('Wait %s seconds after last posting') % str(
                     posting_delay - current_delay)
                 self._errors['text'] = self.error_class([error_message])
 
                 can_post = False
 
         if can_post:
             self.session[LAST_POST_TIME] = time.time()
 
     def validate_image_size(self, size: int):
         if size > board_settings.MAX_IMAGE_SIZE:
             raise forms.ValidationError(
                 _('Image must be less than %s bytes')
                 % str(board_settings.MAX_IMAGE_SIZE))
 
     def _get_image_from_url(self, url: str) -> SimpleUploadedFile:
         """
         Gets an image file from URL.
         """
 
         img_temp = None
 
         try:
             # Verify content headers
             response_head = requests.head(url, verify=False)
             content_type = response_head.headers['content-type'].split(';')[0]
             if content_type in CONTENT_TYPE_IMAGE:
                 length_header = response_head.headers.get('content-length')
                 if length_header:
                     length = int(length_header)
                     self.validate_image_size(length)
                 # Get the actual content into memory
                 response = requests.get(url, verify=False, stream=True)
 
                 # Download image, stop if the size exceeds limit
                 size = 0
                 content = b''
                 for chunk in response.iter_content(IMAGE_DOWNLOAD_CHUNK_BYTES):
                     size += len(chunk)
                     self.validate_image_size(size)
                     content += chunk
 
                 if response.status_code == HTTP_RESULT_OK and content:
                     # Set a dummy file name that will be replaced
                     # anyway, just keep the valid extension
                     filename = 'image.' + content_type.split('/')[1]
                     img_temp = SimpleUploadedFile(filename, content,
                                                   content_type)
         except Exception:
             # Just return no image
             pass
 
         return img_temp
 
 
 class ThreadForm(PostForm):
 
     tags = forms.CharField(
         widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER: TAGS_PLACEHOLDER}),
         max_length=100, label=_('Tags'), required=True)
 
     def clean_tags(self):
         tags = self.cleaned_data['tags'].strip()
 
         if not tags or not REGEX_TAGS.match(tags):
             raise forms.ValidationError(
                 _('Inappropriate characters in tags.'))
 
         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
                 break
 
         if not required_tag_exists:
-            raise forms.ValidationError(_('Need at least 1 required tag.'))
+            all_tags = Tag.objects.filter(required=True)
+            raise forms.ValidationError(
+                _('Need at least one of the tags: ')
+                + ', '.join([tag.name for tag in all_tags]))
 
         return tags
 
     def clean(self):
         cleaned_data = super(ThreadForm, self).clean()
 
         return cleaned_data
 
 
 class SettingsForm(NeboardForm):
 
     theme = forms.ChoiceField(choices=settings.THEMES, label=_('Theme'))
     username = forms.CharField(label=_('User name'), required=False)
     timezone = forms.ChoiceField(choices=get_timezones(), label=_('Time zone'))
 
     def clean_username(self):
         username = self.cleaned_data['username']
 
         if username and not REGEX_TAGS.match(username):
             raise forms.ValidationError(_('Inappropriate characters.'))
 
         return username
 
 
 class SearchForm(NeboardForm):
     query = forms.CharField(max_length=500, label=LABEL_SEARCH, required=False)

boards/locale/ru/LC_MESSAGES/django.po

@@ -1,401 +1,402 b''
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-14 13:07+0300\n"
+"POT-Creation-Date: 2015-04-14 21:16+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"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: admin.py:22
 msgid "{} posters were banned"
 msgstr ""
 
 #: authors.py:9
 msgid "author"
 msgstr "автор"
 
 #: authors.py:10
 msgid "developer"
 msgstr "разработчик"
 
 #: authors.py:11
 msgid "javascript developer"
 msgstr "разработчик javascript"
 
 #: authors.py:12
 msgid "designer"
 msgstr "дизайнер"
 
 #: forms.py:35
 msgid "Type message here. Use formatting panel for more advanced usage."
 msgstr ""
 "Вводите сообщение сюда. Используйте панель для более сложного форматирования."
 
 #: forms.py:36
 msgid "music images i_dont_like_tags"
 msgstr "музыка картинки теги_не_нужны"
 
 #: forms.py:38
 msgid "Title"
 msgstr "Заголовок"
 
 #: forms.py:39
 msgid "Text"
 msgstr "Текст"
 
 #: forms.py:40
 msgid "Tag"
 msgstr "Метка"
 
 #: forms.py:41 templates/boards/base.html:40 templates/search/search.html:7
 msgid "Search"
 msgstr "Поиск"
 
 #: forms.py:140
 msgid "Image"
 msgstr "Изображение"
 
 #: forms.py:143
 msgid "Image URL"
 msgstr "URL изображения"
 
 #: forms.py:149
 msgid "e-mail"
 msgstr ""
 
 #: forms.py:152
 msgid "Additional threads"
 msgstr "Дополнительные темы"
 
 #: forms.py:163
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
 #: forms.py:172
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
 #: forms.py:194
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
 #: forms.py:215
 msgid "Invalid additional thread list"
 msgstr "Неверный список дополнительных тем"
 
 #: forms.py:250
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
 #: forms.py:266
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
 #: forms.py:278
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
 #: forms.py:325 templates/boards/posting_general.html:148
 #: templates/boards/rss/post.html:10 templates/boards/tags.html:7
 msgid "Tags"
 msgstr "Метки"
 
 #: forms.py:332
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в метках."
 
-#: forms.py:343
-msgid "Need at least 1 required tag."
-msgstr "Нужна хотя бы 1 обязательная метка."
+#: forms.py:345
+#| msgid "Need at least 1 required tag."
+msgid "Need at least one of the tags: "
+msgstr "Нужна хотя бы одна из меток: "
 
-#: forms.py:355
+#: forms.py:358
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:356
+#: forms.py:359
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: forms.py:357
+#: forms.py:360
 msgid "Time zone"
 msgstr "Часовой пояс"
 
-#: forms.py:363
+#: forms.py:366
 msgid "Inappropriate characters."
 msgstr "Недопустимые символы."
 
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
 
 #: templates/boards/404.html:12
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
 #: templates/boards/authors.html:6 templates/boards/authors.html.py:12
 msgid "Authors"
 msgstr "Авторы"
 
 #: templates/boards/authors.html:26
 msgid "Distributed under the"
 msgstr "Распространяется под"
 
 #: templates/boards/authors.html:28
 msgid "license"
 msgstr "лицензией"
 
 #: templates/boards/authors.html:30
 msgid "Repository"
 msgstr "Репозиторий"
 
 #: templates/boards/base.html:13
 msgid "Feed"
 msgstr "Лента"
 
 #: templates/boards/base.html:30
 msgid "All threads"
 msgstr "Все темы"
 
 #: templates/boards/base.html:36
 msgid "Add tags"
 msgstr "Добавить метки"
 
 #: templates/boards/base.html:38
 msgid "Tag management"
 msgstr "Управление метками"
 
 #: templates/boards/base.html:43 templates/boards/base.html.py:44
 #: templates/boards/notifications.html:8
 msgid "Notifications"
 msgstr "Уведомления"
 
 #: templates/boards/base.html:51 templates/boards/settings.html:9
 msgid "Settings"
 msgstr "Настройки"
 
 #: templates/boards/base.html:64
 msgid "Admin"
 msgstr "Администрирование"
 
 #: templates/boards/base.html:66
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
 msgstr "Скорость: %(ppd)s сообщений в день"
 
 #: templates/boards/base.html:68
 msgid "Up"
 msgstr "Вверх"
 
 #: templates/boards/notifications.html:17
 #: templates/boards/posting_general.html:81 templates/search/search.html:26
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
 #: templates/boards/notifications.html:27
 #: templates/boards/posting_general.html:121 templates/search/search.html:37
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/post.html:32
+#: templates/boards/post.html:25
 msgid "Open"
 msgstr "Открыть"
 
-#: templates/boards/post.html:34 templates/boards/post.html.py:38
+#: templates/boards/post.html:27 templates/boards/post.html.py:31
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/post.html:43
+#: templates/boards/post.html:36
 msgid "Edit"
 msgstr "Изменить"
 
-#: templates/boards/post.html:45
+#: templates/boards/post.html:38
 msgid "Edit thread"
 msgstr "Изменить тему"
 
-#: templates/boards/post.html:75
+#: templates/boards/post.html:70
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/post.html:86 templates/boards/thread.html:31
+#: templates/boards/post.html:82 templates/boards/thread.html:31
 msgid "messages"
 msgstr "сообщений"
 
-#: templates/boards/post.html:87 templates/boards/thread.html:32
+#: templates/boards/post.html:83 templates/boards/thread.html:32
 msgid "images"
 msgstr "изображений"
 
 #: templates/boards/posting_general.html:65
 msgid "Edit tag"
 msgstr "Изменить метку"
 
 #: templates/boards/posting_general.html:68
 #, python-format
 msgid "This tag has %(thread_count)s threads and %(post_count)s posts."
 msgstr "С этой меткой есть %(thread_count)s тем и %(post_count)s сообщений."
 
 #: templates/boards/posting_general.html:96
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
 #: templates/boards/posting_general.html:126
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
 #: templates/boards/posting_general.html:132
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
 #: templates/boards/posting_general.html:137 templates/boards/preview.html:16
 #: templates/boards/thread_normal.html:46
 msgid "Post"
 msgstr "Отправить"
 
 #: templates/boards/posting_general.html:142
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
 #: templates/boards/posting_general.html:145
 #: templates/boards/thread_normal.html:51
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
 #: templates/boards/posting_general.html:161
 msgid "Pages:"
 msgstr "Страницы: "
 
 #: templates/boards/preview.html:6 templates/boards/staticpages/help.html:20
 msgid "Preview"
 msgstr "Предпросмотр"
 
 #: templates/boards/rss/post.html:5
 msgid "Post image"
 msgstr "Изображение сообщения"
 
 #: templates/boards/settings.html:17
 msgid "You are moderator."
 msgstr "Вы модератор."
 
 #: templates/boards/settings.html:21
 msgid "Hidden tags:"
 msgstr "Скрытые метки:"
 
 #: templates/boards/settings.html:29
 msgid "No hidden tags."
 msgstr "Нет скрытых меток."
 
 #: templates/boards/settings.html:38
 msgid "Save"
 msgstr "Сохранить"
 
 #: templates/boards/staticpages/banned.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
 #: templates/boards/staticpages/banned.html:11
 msgid "Your IP address has been banned. Contact the administrator"
 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
 
 #: templates/boards/staticpages/help.html:6
 #: templates/boards/staticpages/help.html:10
 msgid "Syntax"
 msgstr "Синтаксис"
 
 #: templates/boards/staticpages/help.html:11
 msgid "Italic text"
 msgstr "Курсивный текст"
 
 #: templates/boards/staticpages/help.html:12
 msgid "Bold text"
 msgstr "Полужирный текст"
 
 #: templates/boards/staticpages/help.html:13
 msgid "Spoiler"
 msgstr "Спойлер"
 
 #: templates/boards/staticpages/help.html:14
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
 #: templates/boards/staticpages/help.html:15
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
 #: templates/boards/staticpages/help.html:16
 msgid "Comment"
 msgstr "Комментарий"
 
 #: templates/boards/staticpages/help.html:17
 #: templates/boards/staticpages/help.html:18
 msgid "Quote"
 msgstr "Цитата"
 
 #: templates/boards/staticpages/help.html:20
 msgid "You can try pasting the text and previewing the result here:"
 msgstr "Вы можете попробовать вставить текст и проверить результат здесь:"
 
 #: templates/boards/tags.html:23
 msgid "No tags found."
 msgstr "Метки не найдены."
 
 #: templates/boards/tags.html:26
 msgid "All tags"
 msgstr "Все метки"
 
 #: templates/boards/thread.html:33
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/thread_gallery.html:21
 #: templates/boards/thread_normal.html:16
 msgid "Normal mode"
 msgstr "Нормальный режим"
 
 #: templates/boards/thread_gallery.html:22
 #: templates/boards/thread_normal.html:17
 msgid "Gallery mode"
 msgstr "Режим галереи"
 
 #: templates/boards/thread_gallery.html:52
 msgid "No images."
 msgstr "Нет изображений."
 
 #: templates/boards/thread_normal.html:25
 msgid "posts to bumplimit"
 msgstr "сообщений до бамплимита"
 
 #: templates/boards/thread_normal.html:39
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
 #: templates/boards/thread_normal.html:52
 msgid "Close form"
 msgstr "Закрыть форму"
 
 #: templates/boards/thread_normal.html:68
 msgid "Update"
 msgstr "Обновить"
 
 #: templates/search/search.html:17
 msgid "Ok"
 msgstr "Ок"
 
 #~ msgid "tag1 several_words_tag"
 #~ msgstr "метка1 метка_из_нескольких_слов"