Make it possible to hode a conference series

In particular for "Legacy Series" this can be useful, especially since a
conference has to be in a series.

The actual series is still viewable for people who have kept their link
around, but not listed anywhere.

diff --git a/postgresqleu/confreg/backendforms.py b/postgresqleu/confreg/backendforms.py
index 151164c6c410b20eb49a2c23c508502abe233427..a48fda6fff0b4d48f0c9dff2972226b27d46a7f2 100644 (file)
--- a/postgresqleu/confreg/backendforms.py
+++ b/postgresqleu/confreg/backendforms.py
@@ -219,11 +219,11 @@ class BackendSuperConferenceForm(BackendForm):
 
 class BackendConferenceSeriesForm(BackendForm):
        helplink = "series"
-       list_fields = ['name', 'sortkey', ]
+       list_fields = ['name', 'visible', 'sortkey', ]
        markdown_fields = ['intro', ]
        class Meta:
                model = ConferenceSeries
-               fields = ['name', 'sortkey', 'intro', ]
+               fields = ['name', 'sortkey', 'visible', 'intro', ]
 
 class BackendTshirtSizeForm(BackendForm):
        helplink = "meta"

diff --git a/postgresqleu/confreg/migrations/0034_conference_series_visible.py b/postgresqleu/confreg/migrations/0034_conference_series_visible.py
new file mode 100644 (file)
index 0000000..21f3696
--- /dev/null
+++ b/postgresqleu/confreg/migrations/0034_conference_series_visible.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-10-30 21:40
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('confreg', '0033_speaker_reminders'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='conferenceseries',
+            name='visible',
+            field=models.BooleanField(default=True),
+        ),
+    ]

diff --git a/postgresqleu/confreg/models.py b/postgresqleu/confreg/models.py
index 834e206a74598c63065d6ca6dc505b9182e7ef5f..30b1fa897a7e816169a7fad8803b2b0469830191 100644 (file)
--- a/postgresqleu/confreg/models.py
+++ b/postgresqleu/confreg/models.py
@@ -75,6 +75,7 @@ class ConferenceSeries(models.Model):
        name = models.CharField(max_length=64, blank=False, null=False)
        sortkey = models.IntegerField(null=False, default=100)
        intro = models.TextField(blank=True, null=False)
+       visible = models.BooleanField(null=False, default=True)
 
        def __unicode__(self):
                return self.name

diff --git a/postgresqleu/views.py b/postgresqleu/views.py
index f90f69dd83d2fa9188b6dd6e6c43c37d6fac8b99..6fab4070feca8e0b020c0ec4a77ecf62eb2bc1a9 100644 (file)
--- a/postgresqleu/views.py
+++ b/postgresqleu/views.py
@@ -13,7 +13,7 @@ import markdown
 # Handle the frontpage
 def index(request):
        events = Conference.objects.filter(promoactive=True, enddate__gte=datetime.datetime.today()).order_by('startdate')
-       series = ConferenceSeries.objects.extra(
+       series = ConferenceSeries.objects.filter(visible=True).extra(
                where=["EXISTS (SELECT 1 FROM confreg_conference c WHERE c.series_id=confreg_conferenceseries.id AND c.promoactive)"]
        )
 
@@ -53,7 +53,7 @@ ORDER BY priosort DESC, datetime DESC LIMIT 5""")
 def eventsindex(request):
        events = list(Conference.objects.filter(promoactive=True, enddate__gte=datetime.datetime.today()).order_by('startdate'))
        past = Conference.objects.filter(promoactive=True, enddate__lt=datetime.datetime.today()).order_by('-startdate')[:5]
-       series = ConferenceSeries.objects.extra(
+       series = ConferenceSeries.objects.filter(visible=True).extra(
                where=["EXISTS (SELECT 1 FROM confreg_conference c WHERE c.series_id=confreg_conferenceseries.id AND c.promoactive)"]
        )
 
@@ -70,7 +70,7 @@ def eventsindex(request):
 def pastevents(request):
        events = list(Conference.objects.filter(promoactive=True, enddate__gte=datetime.datetime.today()).order_by('startdate'))
        past = Conference.objects.filter(promoactive=True, enddate__lt=datetime.datetime.today()).order_by('-startdate')
-       series = ConferenceSeries.objects.extra(
+       series = ConferenceSeries.objects.filter(visible=True).extra(
                where=["EXISTS (SELECT 1 FROM confreg_conference c WHERE c.series_id=confreg_conferenceseries.id AND c.promoactive)"]
        )