WIP: For logged

spirit/comment/models.py

@@ -11,15 +11,19 @@
 from ..core.conf import settings
 from .managers import CommentQuerySet
 
-COMMENT, MOVED, CLOSED, UNCLOSED, PINNED, UNPINNED = range(6)
+(COMMENT, MOVED, CLOSED, UNCLOSED, PINNED,
+UNPINNED, FOR_LOGGED, FOR_NON_LOGGED) = range(8)
 
 ACTION = (
     (COMMENT, _("comment")),
     (MOVED, _("topic moved")),
     (CLOSED, _("topic closed")),
     (UNCLOSED, _("topic unclosed")),
     (PINNED, _("topic pinned")),
-    (UNPINNED, _("topic unpinned")))
+    (UNPINNED, _("topic unpinned")),
+    (FOR_LOGGED, _("topic for logged users")),
+    (FOR_NON_LOGGED, _("topic for non logged users")),
+    )
 
 
 class Comment(models.Model):

spirit/topic/forms.py

@@ -22,7 +22,7 @@ class TopicForm(forms.ModelForm):
 
     class Meta:
         model = Topic
-        fields = ('title', 'category')
+        fields = ('title', 'category', 'is_for_logged')
 
     def __init__(self, user, *args, **kwargs):
         super(TopicForm, self).__init__(*args, **kwargs)

spirit/topic/managers.py

@@ -25,6 +25,9 @@ def visible(self):
 
     def opened(self):
         return self.filter(is_closed=False)
+
+    def for_non_logged_users(self):
+        return self.filter(is_for_logged=False)
 
     def global_(self):
         return self.filter(category__is_global=True)
@@ -66,6 +69,7 @@ def get_public_or_404(self, pk, user):
         else:
             return get_object_or_404(
                 self.visible()
+                .for_non_logged_users()
                 .select_related('category__parent'),
                 pk=pk)
 

spirit/topic/models.py

@@ -44,6 +44,7 @@ class Topic(models.Model):
     is_globally_pinned = models.BooleanField(_("globally pinned"), default=False)
     is_closed = models.BooleanField(_("closed"), default=False)
     is_removed = models.BooleanField(default=False)
+    is_for_logged = models.BooleanField(_("is for logged"), default=False)
 
     view_count = models.PositiveIntegerField(_("views count"), default=0)
     comment_count = models.PositiveIntegerField(_("comment count"), default=0)

spirit/topic/moderate/urls.py

@@ -20,4 +20,6 @@
 
     url(r'^global-pin/(?P<pk>[0-9]+)/$', views.global_pin, name='global-pin'),
     url(r'^global-unpin/(?P<pk>[0-9]+)/$', views.global_unpin, name='global-unpin'),
+    url(r'^for-logged/(?P<pk>[0-9]+)/$', views.for_logged, name='for-logged'),
+    url(r'^for-non-logged/(?P<pk>[0-9]+)/$', views.for_non_logged, name='for-non-logged'),
 ]

spirit/topic/moderate/views.py

@@ -6,7 +6,8 @@
 from django.shortcuts import render, redirect, get_object_or_404
 
 from ...core.utils.decorators import moderator_required
-from ...comment.models import Comment, CLOSED, UNCLOSED, PINNED, UNPINNED
+from ...comment.models import (Comment, CLOSED, UNCLOSED, PINNED, UNPINNED,
+        FOR_LOGGED, FOR_NON_LOGGED)
 from ..models import Topic
 
 
@@ -103,3 +104,19 @@ def global_unpin(request, pk):
         field_name='is_globally_pinned',
         to_value=False,
         action=UNPINNED)
+
+def for_logged(request, pk):
+    return _moderate(
+        request=request,
+        pk=pk,
+        field_name='is_for_logged',
+        to_value=True,
+        action=FOR_LOGGED)
+
+def for_non_logged(request, pk):
+    return _moderate(
+        request=request,
+        pk=pk,
+        field_name='is_for_logged',
+        to_value=False,
+        action=FOR_NON_LOGGED)

spirit/topic/templates/spirit/topic/detail.html

@@ -97,6 +97,18 @@ <h1 class="headline">
               </li>
             {% endif %}
 
+            {% if topic.is_for_logged %}
+              <li>
+                <a class="menu-link js-post" href="{% url "spirit:topic:moderate:for-non-logged" topic.pk %}">
+                  <i class="fa fa-thumb-tack"></i> {% trans "Set for non logged users" %}</a>
+              </li>
+            {% else %}
+              <li>
+                <a class="menu-link js-post" href="{% url "spirit:topic:moderate:for-logged" topic.pk %}">
+                  <i class="fa fa-thumb-tack"></i> {% trans "Set for logged users" %}</a>
+              </li>
+            {% endif %}
+
             {% if topic.is_globally_pinned %}
               <li>
                 <a class="menu-link js-post" href="{% url "spirit:topic:moderate:global-unpin" topic.pk %}">

spirit/topic/views.py

@@ -123,6 +123,9 @@ def index_active(request):
         .order_by('-is_globally_pinned', '-last_active')
         .select_related('category'))
 
+    if not request.user.is_authenticated:
+        topics = topics.for_non_logged_users()
+
     topics = yt_paginate(
         topics,
         per_page=config.topics_per_page,