[COM] Make the news visible for non-authenticated user and birthday visible for subriber only

com/migrations/0006_remove_sith_index_page.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.23 on 2019-08-18 17:00
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("com", "0005_auto_20180318_2227")]
+
+    operations = [migrations.RemoveField(model_name="sith", name="index_page")]

com/models.py

@@ -45,7 +45,6 @@ class Sith(models.Model):
 
     alert_msg = models.TextField(_("alert message"), default="", blank=True)
     info_msg = models.TextField(_("info message"), default="", blank=True)
-    index_page = models.TextField(_("index page"), default="", blank=True)
     weekmail_destinations = models.TextField(_("weekmail destinations"), default="")
 
     def is_owned_by(self, user):

com/templates/com/news_list.jinja

@@ -40,22 +40,26 @@
 
       <div id="birthdays">
         <div id="birthdays_title">{% trans %}Birthdays{% endtrans %}</div>
-        <div id="birthdays_content">
-          <ul class="birthdays_year">
-          {% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %}
-          <li>
-              {% trans age=timezone.now().year - d.year %}{{ age }} year old{% endtrans %}
-              <ul>
-              {% for u in birthdays.filter(date_of_birth__year=d.year) %}
-                  <li><a href="{{ u.get_absolute_url() }}">{{ u.get_short_name() }}</a></li>
-              {% endfor %}
+          <div id="birthdays_content">
+            {% if user.is_subscribed %}
+              <ul class="birthdays_year">
+                {% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %}
+                  <li>
+                    {% trans age=timezone.now().year - d.year %}{{ age }} year old{% endtrans %}
+                    <ul>
+                      {% for u in birthdays.filter(date_of_birth__year=d.year) %}
+                        <li><a href="{{ u.get_absolute_url() }}">{{ u.get_short_name() }}</a></li>
+                      {% endfor %}
+                    </ul>
+                  </li>
+                {% endfor %}
               </ul>
-          </li>
-          {% endfor %}
-          </ul>
+            {% else %}
+              <p>{% trans %}You need an up to date subscription to access this content{% endtrans %}</p>
+            {% endif %}
+          </div>
         </div>
       </div>
-    </div>
 
 
     <div id="left_column" class="news_column">

com/tests.py

@@ -26,6 +26,9 @@ from django.test import TestCase
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.core.management import call_command
+from django.utils import html
+from django.utils.translation import ugettext as _
+
 
 from core.models import User, RealGroup
 
@@ -74,3 +77,23 @@ class ComTest(TestCase):
             """<div id="info_box">\\n                <div class="markdown"><h3>INFO: <strong>Caaaataaaapuuuulte!!!!</strong></h3>"""
             in str(r.content)
         )
+
+    def test_birthday_non_subscribed_user(self):
+        self.client.login(username="guy", password="plop")
+        response = self.client.get(reverse("core:index"))
+        self.assertContains(
+            response,
+            text=html.escape(
+                _("You need an up to date subscription to access this content")
+            ),
+        )
+
+    def test_birthday_subscibed_user(self):
+        response = self.client.get(reverse("core:index"))
+
+        self.assertNotContains(
+            response,
+            text=html.escape(
+                _("You need an up to date subscription to access this content")
+            ),
+        )

com/urls.py

@@ -30,7 +30,6 @@ from club.views import MailingDeleteView
 urlpatterns = [
     url(r"^sith/edit/alert$", AlertMsgEditView.as_view(), name="alert_edit"),
     url(r"^sith/edit/info$", InfoMsgEditView.as_view(), name="info_edit"),
-    url(r"^sith/edit/index$", IndexEditView.as_view(), name="index_edit"),
     url(
         r"^sith/edit/weekmail_destinations$",
         WeekmailDestinationEditView.as_view(),

com/views.py

@@ -182,14 +182,6 @@ class InfoMsgEditView(ComEditView):
     success_url = reverse_lazy("com:info_edit")
 
 
-class IndexEditView(ComEditView):
-    form_class = modelform_factory(
-        Sith, fields=["index_page"], widgets={"index_page": MarkdownInput}
-    )
-    current_tab = "index"
-    success_url = reverse_lazy("com:index_edit")
-
-
 class WeekmailDestinationEditView(ComEditView):
     fields = ["weekmail_destinations"]
     current_tab = "weekmail_destinations"

core/templates/core/index.jinja

-{% extends "core/base.jinja" %}
-
-{% block title %}
-{% trans %}Welcome!{% endtrans %}
-{% endblock %}
-
-{% block content %}
-    {{ get_sith().index_page|markdown }}
-{% endblock %}

core/views/site.py

@@ -40,11 +40,9 @@ from club.models import Club
 
 
 def index(request, context=None):
-    if request.user.is_authenticated():
-        from com.views import NewsListView
+    from com.views import NewsListView
 
-        return NewsListView.as_view()(request)
-    return render(request, "core/index.jinja")
+    return NewsListView.as_view()(request)
 
 
 class NotificationList(ListView):