Added 'ban' button to the moderator panel.

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: 2013-09-09 21:00+0300\n"
+"POT-Creation-Date: 2013-09-09 21:52+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"
@@ -89,21 +89,21 b' msgstr "\xd0\x98\xd0\xb7\xd0\xbe\xd0\xb1\xd1\x80\xd0\xb0\xd0\xb6\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5 \xd1\x81\xd0\xbe\xd0\xbe\xd0\xb1\xd1\x89\xd0\xb5\xd0\xbd\xd0\xb8\xd1\x8f"'
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/boards/posting_general.html:54 templates/boards/thread.html:46
+#: templates/boards/posting_general.html:54 templates/boards/thread.html:45
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/boards/posting_general.html:63 templates/boards/thread.html:107
+#: templates/boards/posting_general.html:63 templates/boards/thread.html:112
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/posting_general.html:64 templates/boards/thread.html:108
+#: templates/boards/posting_general.html:64 templates/boards/thread.html:113
 msgid "images"
 msgstr "изображений"
 
 #: templates/boards/posting_general.html:66
 #: templates/boards/posting_general.html:139 templates/boards/tags.html:7
-#: templates/boards/thread.html:56 templates/boards/rss/post.html:10
+#: templates/boards/thread.html:58 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
@@ -115,32 +115,32 b' msgstr "\xd0\x9d\xd0\xb5\xd1\x82 \xd1\x82\xd0\xb5\xd0\xbc. \xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd0\xb9\xd1\x82\xd0\xb5 \xd0\xbf\xd0\xb5\xd1\x80\xd0\xb2\xd1\x83\xd1\x8e!"'
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/boards/posting_general.html:124 templates/boards/thread.html:75
+#: templates/boards/posting_general.html:124 templates/boards/thread.html:77
 msgid "Title"
 msgstr "Заголовок"
 
-#: templates/boards/posting_general.html:129 templates/boards/thread.html:80
+#: templates/boards/posting_general.html:129 templates/boards/thread.html:82
 msgid "Text"
 msgstr "Текст"
 
-#: templates/boards/posting_general.html:134 templates/boards/thread.html:85
+#: templates/boards/posting_general.html:134 templates/boards/thread.html:87
 msgid "Image"
 msgstr "Изображение"
 
-#: templates/boards/posting_general.html:149 templates/boards/thread.html:96
+#: templates/boards/posting_general.html:152 templates/boards/thread.html:101
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/boards/posting_general.html:151
+#: templates/boards/posting_general.html:154
 msgid "Tags must be delimited by spaces. Text or image is required."
 msgstr ""
 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
 
-#: templates/boards/posting_general.html:154 templates/boards/thread.html:98
+#: templates/boards/posting_general.html:157 templates/boards/thread.html:103
 msgid "Text syntax"
 msgstr "Синтаксис текста"
 
-#: templates/boards/posting_general.html:164
+#: templates/boards/posting_general.html:167
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -176,16 +176,19 b' msgstr "\xd0\x94\xd0\xbe\xd0\xb1\xd0\xb0\xd0\xb2\xd0\xb8\xd1\x82\xd1\x8c"'
 msgid "No tags found."
 msgstr "Теги не найдены."
 
-#: templates/boards/thread.html:72
+#: templates/boards/thread.html:48
+msgid "Ban IP"
+msgstr "Заблокировать IP"
+
+#: templates/boards/thread.html:74
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/boards/thread.html:109
+#: templates/boards/thread.html:114
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
 #: templates/boards/staticpages/banned.html:6
-#: templates/boards/staticpages/help.html:6
 msgid "Banned"
 msgstr "Заблокирован"
 
@@ -193,6 +196,7 b' msgstr "\xd0\x97\xd0\xb0\xd0\xb1\xd0\xbb\xd0\xbe\xd0\xba\xd0\xb8\xd1\x80\xd0\xbe\xd0\xb2\xd0\xb0\xd0\xbd"'
 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 "Синтаксис"

boards/models.py

@@ -312,7 +312,7 b' class User(models.Model):'
         return self.fav_tags.order_by('name')
 
     def __unicode__(self):
-        return self.user_id + '(' + self.rank + ')'
+        return self.user_id + '(' + str(self.rank) + ')'
 
 
 class Setting(models.Model):

boards/templates/boards/thread.html

@@ -41,9 +41,11 b''
 
                     {% if user.is_moderator %}
                         <span class="moderator_info">
-                            ({{ post.poster_ip }})
                             [<a href="{% url 'delete' post_id=post.id %}"
                                 >{% trans 'Delete' %}</a>]
+                            ({{ post.poster_ip }})
+                            [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
+                                >{% trans 'Ban IP' %}</a>]
                         </span>
                     {% endif %}
                 </div>

boards/urls.py

@@ -37,6 +37,8 b" urlpatterns = patterns('',"
     url(r'^jump/(?P<post_id>\w+)/$', views.jump_to_post, name='jumper'),
     url(r'^authors/$', views.authors, name='authors'),
     url(r'^delete/(?P<post_id>\w+)/$', views.delete, name='delete'),
+    url(r'^ban/(?P<post_id>\w+)/$', views.ban, name='ban'),
+
     url(r'^banned/$', views.you_are_banned, name='banned'),
     url(r'^staticpage/(?P<name>\w+)/$', views.static_page, name='staticpage'),
 

boards/views.py

@@ -238,6 +238,17 b' def delete(request, post_id):'
         return redirect(thread, post_id=post.parent)
 
 
+def ban(request, post_id):
+    user = _get_user(request)
+    post = get_object_or_404(Post, id=post_id)
+
+    if user.is_moderator():
+        # TODO Show confirmation page before ban
+        Ban.objects.get_or_create(ip=post.poster_ip)
+
+    return _redirect_to_next(request)
+
+
 def you_are_banned(request):
     context = _init_default_context(request)
     return render(request, 'boards/staticpages/banned.html', context)
@@ -333,5 +344,8 b' def _get_user(request):'
 
 
 def _redirect_to_next(request):
-    next_page = request.GET['next']
-    return HttpResponseRedirect(next_page)
+    if 'next' in request.GET:
+        next_page = request.GET['next']
+        return HttpResponseRedirect(next_page)
+    else:
+        return redirect(index)