From 813d9eeb7425b2064a50ec5d228df122affc4f4f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
Date: Thu, 11 Jun 2020 12:54:11 +0200
Subject: [PATCH] remove usage of Topik object

---
 panikdb/context_processors.py                  |  1 -
 panikdb/customtags/templatetags/panikdbtags.py | 14 +-------------
 panikdb/settings.py                            |  1 -
 panikdb/templates/combo/manager_base.html      | 11 -----------
 panikdb/urls.py                                |  5 -----
 panikdb/views.py                               |  8 --------
 6 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/panikdb/context_processors.py b/panikdb/context_processors.py
index ed18da3..3707f95 100644
--- a/panikdb/context_processors.py
+++ b/panikdb/context_processors.py
@@ -8,7 +8,6 @@ def internal_ip(request):
 
 def site_settings(request):
     return {
-        'enable_topiks': settings.ENABLE_TOPIKS,
         'site_title': settings.SITE_TITLE,
         'has_soma': settings.HAS_SOMA,
     }
diff --git a/panikdb/customtags/templatetags/panikdbtags.py b/panikdb/customtags/templatetags/panikdbtags.py
index 35616ef..2c4176e 100644
--- a/panikdb/customtags/templatetags/panikdbtags.py
+++ b/panikdb/customtags/templatetags/panikdbtags.py
@@ -4,7 +4,6 @@ from django.core.urlresolvers import reverse
 from django.db.models import Sum
 
 from emissions.models import Emission, Episode, NewsItem, SoundFile, Focus
-from panikombo.models import Topik
 from panikdb.stats.models import DailyStat
 from combo.data.models import Page
 
@@ -112,11 +111,7 @@ def can_focus(object):
     elif isinstance(object, SoundFile):
         return bool(object.format)
     elif isinstance(object, Page):
-        try:
-            topik = Topik.objects.get(page=object)
-        except Topik.DoesNotExist:
-            return False
-        return bool(topik.image)
+        return bool(object.picture)
     return False
 
 
@@ -131,13 +126,6 @@ def as_duration(value):
 def is_page(obj):
     return isinstance(obj, Page)
 
-@register.filter
-def has_topik(obj):
-    return Topik.objects.filter(page=obj).count() == 1
-
-@register.filter
-def topik_id(obj):
-    return Topik.objects.get(page=obj).id
 
 @register.filter
 def nb_visits(obj):
diff --git a/panikdb/settings.py b/panikdb/settings.py
index cce69e9..67b3a6f 100644
--- a/panikdb/settings.py
+++ b/panikdb/settings.py
@@ -265,7 +265,6 @@ TEMPLATE_VARS = {}
 FILE_UPLOAD_DIRECTORY_PERMISSIONS = 0o755
 FILE_UPLOAD_PERMISSIONS = 0o644
 
-ENABLE_TOPIKS = True
 HAS_SOMA = False
 SITE_TITLE = 'PanikDB'
 COMBO_CELL_ASSET_SLOTS = {}
diff --git a/panikdb/templates/combo/manager_base.html b/panikdb/templates/combo/manager_base.html
index 2286f8a..4f7e49d 100644
--- a/panikdb/templates/combo/manager_base.html
+++ b/panikdb/templates/combo/manager_base.html
@@ -12,17 +12,6 @@
 {% block more-user-links %}
 {{ block.super }}
 <a href="{% url 'combo-manager-homepage' %}">Pages éditoriales</a>
-{% if enable_topiks %}
-{% if object|is_page %}
-{% if object|has_topik %}
-  {% with object|topik_id as topik_id %}
-  <a rel="popup" href="{% url 'edit-topik' pk=topik_id %}">Options de Topik</a>
-  {% endwith %}
-{% else %}
-  <a href="{% url 'make-topik' page_pk=object.id %}">Transformer en Topik</a>
-{% endif %}
-{% endif %}
-{% endif %}
 {% endblock %}
 
 {% block bodyattr %}class="combo"{% endblock %}
diff --git a/panikdb/urls.py b/panikdb/urls.py
index 6c38a98..ecfb65a 100644
--- a/panikdb/urls.py
+++ b/panikdb/urls.py
@@ -64,11 +64,6 @@ urlpatterns = [
     url(r'^focus/unset/(?P<object_type>[\w,-]+)/(?P<object_id>\d+)$',
         views.focus_unset, name='focus-unset'),
 
-    url(r'^cms/pages/(?P<page_pk>\w+)/make-topik$', views.make_topik,
-        name='make-topik'),
-    url(r'^cms/pages/topik/(?P<pk>\w+)/edit-topik$', panikombo.views.topik_edit,
-        name='edit-topik'),
-
     url(r'^accounts/logout/', auth_views.logout_then_login, name='logout'),
     url(r'^accounts/password/reset/$',
         auth_views.password_reset,
diff --git a/panikdb/views.py b/panikdb/views.py
index ec08d9b..2a0a00a 100644
--- a/panikdb/views.py
+++ b/panikdb/views.py
@@ -11,7 +11,6 @@ from django.shortcuts import redirect
 
 from emissions.models import *
 from emissions.utils import period_program
-from panikombo.models import Topik
 from combo.data.models import Page
 
 import emissions.views
@@ -212,10 +211,3 @@ class FocusUnsetView(RedirectView):
             return reverse('combo-manager-page-view', kwargs={'pk': object_id})
 
 focus_unset = FocusUnsetView.as_view()
-
-def make_topik(request, page_pk):
-    if Topik.objects.filter(page__id=page_pk).count():
-        raise Exception('page already associated to topik')
-    topik = Topik(page_id=page_pk)
-    topik.save()
-    return redirect('combo-manager-page-view', pk=page_pk)
-- 
2.39.2