diff --git a/src/pretix/base/migrations/0003_event_is_public.py b/src/pretix/base/migrations/0003_event_is_public.py new file mode 100644 index 0000000000..3383f86723 --- /dev/null +++ b/src/pretix/base/migrations/0003_event_is_public.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pretixbase', '0002_auto_20151021_1412'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='is_public', + field=models.BooleanField(help_text="If selected, this event may show up on the ticket system's start page or an organization profile.", default=False, verbose_name='Visible in public lists'), + ), + ] diff --git a/src/pretix/base/models/event.py b/src/pretix/base/models/event.py index aac6748620..66e5dfa0a7 100644 --- a/src/pretix/base/models/event.py +++ b/src/pretix/base/models/event.py @@ -73,6 +73,10 @@ class Event(Versionable): date_from = models.DateTimeField(verbose_name=_("Event start time")) date_to = models.DateTimeField(null=True, blank=True, verbose_name=_("Event end time")) + is_public = models.BooleanField(default=False, + verbose_name=_("Visible in public lists"), + help_text=_("If selected, this event may show up on the ticket system's start page " + "or an organization profile.")) presale_end = models.DateTimeField( null=True, blank=True, verbose_name=_("End of presale"), diff --git a/src/pretix/base/templatetags/__init__.py b/src/pretix/base/templatetags/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/pretix/base/templatetags/urlreplace.py b/src/pretix/base/templatetags/urlreplace.py new file mode 100644 index 0000000000..cd9e794875 --- /dev/null +++ b/src/pretix/base/templatetags/urlreplace.py @@ -0,0 +1,10 @@ +from django import template + +register = template.Library() + + +@register.simple_tag +def url_replace(request, field, value): + dict_ = request.GET.copy() + dict_[field] = value + return dict_.urlencode() diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index c5fd6aa3bd..fe4ddbf3cc 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -56,6 +56,7 @@ class EventUpdateForm(VersionedModelForm): 'currency', 'date_from', 'date_to', + 'is_public', 'presale_start', 'presale_end', ] diff --git a/src/pretix/control/templates/pretixcontrol/event/settings.html b/src/pretix/control/templates/pretixcontrol/event/settings.html index 5d5964abc6..c7275267fd 100644 --- a/src/pretix/control/templates/pretixcontrol/event/settings.html +++ b/src/pretix/control/templates/pretixcontrol/event/settings.html @@ -12,6 +12,7 @@ {% bootstrap_field form.date_from layout="horizontal" %} {% bootstrap_field form.date_to layout="horizontal" %} {% bootstrap_field form.currency layout="horizontal" %} + {% bootstrap_field form.is_public layout="horizontal" %}
{% trans "Display settings" %} diff --git a/src/pretix/control/templates/pretixcontrol/pagination.html b/src/pretix/control/templates/pretixcontrol/pagination.html index fb7f2bbfe0..6872936953 100644 --- a/src/pretix/control/templates/pretixcontrol/pagination.html +++ b/src/pretix/control/templates/pretixcontrol/pagination.html @@ -1,10 +1,11 @@ {% load i18n %} +{% load urlreplace %} {% if is_paginated %}