Don't allow characters in username that we cannot use as a URL

boards/forms.py

@@ -327,6 +327,14 b' class SettingsForm(NeboardForm):'
                               label=_('Theme'))
     username = forms.CharField(label=_('User name'), required=False)
 
+    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

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-21 20:03+0200\n"
+"POT-Creation-Date: 2015-02-24 08:32+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"
@@ -124,6 +124,10 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xbc\xd0\xb0"'
 msgid "User name"
 msgstr "Имя пользователя"
 
+#: forms.py:334
+msgid "Inappropriate characters."
+msgstr "Недопустимые символы."
+
 #: templates/boards/404.html:6
 msgid "Not found"
 msgstr "Не найдено"
@@ -160,7 +164,7 b' msgstr "\xd0\x92\xd1\x81\xd0\xb5 \xd1\x82\xd0\xb5\xd0\xbc\xd1\x8b"'
 msgid "Tag management"
 msgstr "Управление метками"
 
-#: templates/boards/base.html:41
+#: templates/boards/base.html:41 templates/boards/notifications.html:7
 msgid "Notifications"
 msgstr "Уведомления"
 
@@ -193,13 +197,13 b' msgstr "\xd0\x92\xd1\x85\xd0\xbe\xd0\xb4"'
 msgid "Insert your user id above"
 msgstr "Вставьте свой ID пользователя выше"
 
-#: templates/boards/notifications.html:10
+#: templates/boards/notifications.html:16
 #: templates/boards/posting_general.html:85 templates/search/search.html:22
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/notifications.html:20
-#: templates/boards/posting_general.html:127 templates/search/search.html:33
+#: templates/boards/notifications.html:26
+#: templates/boards/posting_general.html:125 templates/search/search.html:33
 msgid "Next page"
 msgstr "Следующая страница"
 
@@ -254,34 +258,34 b' msgstr "\xd0\x98\xd0\xb7\xd0\xbc\xd0\xb5\xd0\xbd\xd0\xb8\xd1\x82\xd1\x8c \xd0\xbc\xd0\xb5\xd1\x82\xd0\xba\xd1\x83"'
 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:100
+#: templates/boards/posting_general.html:99
 #, python-format
 msgid "Skipped %(count)s replies. Open thread to see all replies."
 msgstr "Пропущено %(count)s ответов. Откройте тред, чтобы увидеть все ответы."
 
-#: templates/boards/posting_general.html:132
+#: templates/boards/posting_general.html:130
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/posting_general.html:138
+#: templates/boards/posting_general.html:136
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:143 templates/boards/preview.html:16
+#: templates/boards/posting_general.html:141 templates/boards/preview.html:16
 #: templates/boards/thread.html:54
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:148
+#: templates/boards/posting_general.html:146
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Метки должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:151 templates/boards/thread.html:59
+#: templates/boards/posting_general.html:149 templates/boards/thread.html:59
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:163
+#: templates/boards/posting_general.html:161
 msgid "Pages:"
 msgstr "Страницы: "
 

boards/templates/boards/posting_general.html

@@ -89,8 +89,7 b''
         {% for thread in threads %}
             {% cache 600 thread_short thread.id thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
-                {% with can_bump=thread.can_bump %}
-                {% post_view thread.get_opening_post moderator is_opening=True thread=thread can_bump=can_bump truncated=True need_open_link=True %}
+                {% post_view thread.get_opening_post moderator is_opening=True thread=thread truncated=True need_open_link=True %}
                 {% if not thread.archived %}
                     {% with last_replies=thread.get_last_replies %}
                         {% if last_replies %}
@@ -109,7 +108,6 b''
                         {% endif %}
                     {% endwith %}
                 {% endif %}
-                {% endwith %}
             </div>
             {% endcache %}
         {% endfor %}

boards/views/settings.py

@@ -11,11 +11,13 b" FORM_USERNAME = 'username'"
 
 CONTEXT_HIDDEN_TAGS = 'hidden_tags'
 
+TEMPLATE = 'boards/settings.html'
+
 
 class SettingsView(BaseBoardView):
 
     def get(self, request):
-        params = self.get_context_data()
+        params = dict()
         settings_manager = get_settings_manager(request)
 
         selected_theme = settings_manager.get_theme()
@@ -29,8 +31,7 b' class SettingsView(BaseBoardView):'
         params[CONTEXT_FORM] = form
         params[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
 
-        # TODO Use dict here
-        return render(request, 'boards/settings.html', params)
+        return render(request, TEMPLATE, params)
 
     def post(self, request):
         settings_manager = get_settings_manager(request)
@@ -46,5 +47,13 b' class SettingsView(BaseBoardView):'
 
                 settings_manager.set_setting(SETTING_USERNAME, username)
                 settings_manager.set_setting(SETTING_LAST_NOTIFICATION_ID, None)
+            
+                return redirect('settings')
+            else:
+                params = dict()
 
-            return redirect('settings')
+                params[CONTEXT_FORM] = form
+                params[CONTEXT_HIDDEN_TAGS] = settings_manager.get_hidden_tags()
+
+                return render(request, TEMPLATE, params)
+