Moved tag subscribe and unsubscribe methods to the tag view. Added a

dispatcher mixin instead of separate subscribe and unsubscribe views

boards/views/mixins.py

@@ -0,0 +1,33 b''
+PARAMETER_METHOD = 'method'
+
+from django.shortcuts import redirect
+from django.http import HttpResponseRedirect
+
+
+class RedirectNextMixin:
+
+    def redirect_to_next(self, request):
+        """
+        If a 'next' parameter was specified, redirect to the next page. This
+        is used when the user is required to return to some page after the
+        current view has finished its work.
+        """
+
+        if 'next' in request.GET:
+            next_page = request.GET['next']
+            return HttpResponseRedirect(next_page)
+        else:
+            return redirect('index')
+
+
+class DispatcherMixin:
+    """
+    This class contains a dispather method that can run a method specified by
+    'method' request parameter.
+    """
+
+    def dispatch_method(self, request):
+        if PARAMETER_METHOD in request.GET:
+            method_name = request.GET[PARAMETER_METHOD]
+            return getattr(self, method_name)(request)
+

boards/templates/boards/post.html

@@ -4,7 +4,7 b''
 
 {% get_current_language as LANGUAGE_CODE %}
 
-{% cache 300 post post.id post.thread_new.last_edit_time truncated moderator LANGUAGE_CODE need_open_link %}
+{% cache 600 post post.id post.thread_new.last_edit_time truncated moderator LANGUAGE_CODE need_open_link %}
     {% spaceless %}
         {% with thread=post.thread_new %}
             {% if thread.archived %}

boards/templates/boards/posting_general.html

@@ -41,10 +41,10 b''
     <div class="tag_info">
         <h2>
             {% if tag in user.fav_tags.all %}
-                <a href="{% url 'tag_unsubscribe' tag.name %}?next={{ request.path }}"
+                <a href="{% url 'tag' tag.name %}?method=unsubscribe&next={{ request.path }}"
                    class="fav">★</a>
             {% else %}
-                <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
+                <a href="{% url 'tag' tag.name %}?method=subscribe&next={{ request.path }}"
                    class="not_fav">★</a>
             {% endif %}
             #{{ tag.name }}

boards/templates/boards/tags.html

@@ -13,10 +13,10 b''
             {% for tag in all_tags %}
                 <div class="tag_item" style="font-size: {{ tag.get_font_value }}em">
                 {% if tag in user.fav_tags.all %}
-                    <a href="{% url 'tag_unsubscribe' tag.name %}?next={{ request.path }}"
+                    <a href="{% url 'tag' tag.name %}?method=unsubscribe&next={{ request.path }}"
                         class="fav">★</a>
                 {% else %}
-                    <a href="{% url 'tag_subscribe' tag.name %}?next={{ request.path }}"
+                    <a href="{% url 'tag' tag.name %}?method=subscribe&next={{ request.path }}"
                         class="not_fav">★</a>
                 {% endif %}
                 <a class="tag" href="{% url 'tag' tag.name %}">

boards/urls.py

@@ -33,13 +33,6 b" urlpatterns = patterns('',"
     url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/$',
         tag_threads.TagView.as_view(), name='tag'),
 
-    # /boards/tag/tag_name/unsubscribe/
-    url(r'^tag/(?P<tag_name>\w+)/subscribe/$', views.tag_subscribe,
-        name='tag_subscribe'),
-    # /boards/tag/tag_name/unsubscribe/
-    url(r'^tag/(?P<tag_name>\w+)/unsubscribe/$', views.tag_unsubscribe,
-        name='tag_unsubscribe'),
-
     # /boards/thread/
     url(r'^thread/(?P<post_id>\w+)/$', views.thread.ThreadView.as_view(),
         name='thread'),

boards/views/__init__.py

@@ -22,32 +22,6 b' from boards import authors'
 import neboard
 
 
[e-mail]
-def tag_subscribe(request, tag_name):
-    """Add tag to favorites"""
-
-    user = _get_user(request)
-    tag = get_object_or_404(Tag, name=tag_name)
-
-    if not tag in user.fav_tags.all():
-        user.add_tag(tag)
-
-    return _redirect_to_next(request)
-
-
[e-mail]
-def tag_unsubscribe(request, tag_name):
-    """Remove tag from favorites"""
-
-    user = _get_user(request)
-    tag = get_object_or_404(Tag, name=tag_name)
-
-    if tag in user.fav_tags.all():
-        user.remove_tag(tag)
-
-    return _redirect_to_next(request)
-
-
 def static_page(request, name):
     """Show a static page that needs only tags list and a CSS"""
 

boards/views/ban.py

@@ -3,9 +3,10 b' from django.shortcuts import get_object_'
 
 from boards.views.base import BaseBoardView
 from boards.models import Post, Ban
+from boards.views.mixins import RedirectNextMixin
 
 
-class BanUserView(BaseBoardView):
+class BanUserView(BaseBoardView, RedirectNextMixin):
 
     @transaction.atomic
     def get(self, request, post_id):

boards/views/delete_post.py

@@ -2,7 +2,7 b' from django.shortcuts import redirect, g'
 from django.db import transaction
 
 from boards.views.base import BaseBoardView
-from boards.views.redirect_next_mixin import RedirectNextMixin
+from boards.views.mixins import RedirectNextMixin
 from boards.models import Post
 
 

boards/views/tag_threads.py

@@ -1,11 +1,12 b''
 from django.shortcuts import get_object_or_404
 from boards.models import Tag, Post
 from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE
+from boards.views.mixins import DispatcherMixin, RedirectNextMixin
 
 __author__ = 'neko259'
 
 
-class TagView(AllThreadsView):
+class TagView(AllThreadsView, DispatcherMixin, RedirectNextMixin):
 
     tag_name = None
 
@@ -25,4 +26,26 b' class TagView(AllThreadsView):'
     def get(self, request, tag_name, page=DEFAULT_PAGE):
         self.tag_name = tag_name
 
-        return super(TagView, self).get(request, page)
+        dispatch_result = self.dispatch_method(request)
+        if dispatch_result:
+            return dispatch_result
+        else:
+            return super(TagView, self).get(request, page)
+
+    def subscribe(self, request):
+        user = self._get_user(request)
+        tag = get_object_or_404(Tag, name=self.tag_name)
+
+        if not tag in user.fav_tags.all():
+            user.add_tag(tag)
+
+        return self.redirect_to_next(request)
+
+    def unsubscribe(self, request):
+        user = self._get_user(request)
+        tag = get_object_or_404(Tag, name=self.tag_name)
+
+        if tag in user.fav_tags.all():
+            user.remove_tag(tag)
+
+        return self.redirect_to_next(request)