diff --git a/app/eventyay/agenda/management/commands/export_schedule_html.py b/app/eventyay/agenda/management/commands/export_schedule_html.py index 0c401c4156..5d3bb10794 100644 --- a/app/eventyay/agenda/management/commands/export_schedule_html.py +++ b/app/eventyay/agenda/management/commands/export_schedule_html.py @@ -22,7 +22,7 @@ @contextlib.contextmanager def fake_admin(event): with rolledback_transaction(): - event.is_public = True + event.live = True event.custom_domain = None event.feature_flags['show_schedule'] = True event.save() diff --git a/app/eventyay/agenda/permissions.py b/app/eventyay/agenda/permissions.py index 71210078a8..4e2cc4e5bc 100644 --- a/app/eventyay/agenda/permissions.py +++ b/app/eventyay/agenda/permissions.py @@ -7,7 +7,7 @@ def is_agenda_visible(user, event): return bool( event - and event.is_public + and event.live and event.get_feature_flag("show_schedule") and event.current_schedule ) @@ -27,7 +27,7 @@ def has_agenda(user, event): def are_featured_submissions_visible(user, event): if ( not event - or not event.is_public + or not event.live or event.get_feature_flag("show_featured") == "never" ): return False diff --git a/app/eventyay/agenda/views/widget.py b/app/eventyay/agenda/views/widget.py index c8ac974991..8da6b4f92e 100644 --- a/app/eventyay/agenda/views/widget.py +++ b/app/eventyay/agenda/views/widget.py @@ -30,7 +30,7 @@ def widget_js_etag(request, event, **kwargs): return WIDGET_JS_CHECKSUM -def is_public_and_versioned(request, event, version=None): +def is_live_and_versioned(request, event, version=None): if version and version == 'wip': # We never cache the wip schedule return False @@ -52,7 +52,7 @@ def version_prefix(request, event, version=None): @conditional_cache_page( 60, key_prefix=version_prefix, - condition=is_public_and_versioned, + condition=is_live_and_versioned, server_timeout=5 * 60, headers={ 'Access-Control-Allow-Headers': 'authorization,content-type', diff --git a/app/eventyay/cfp/permissions.py b/app/eventyay/cfp/permissions.py index 72999fd5d3..42dee8061f 100644 --- a/app/eventyay/cfp/permissions.py +++ b/app/eventyay/cfp/permissions.py @@ -7,7 +7,7 @@ @rules.predicate def is_event_visible(user, event): - return event and event.is_public + return event and event.live @rules.predicate diff --git a/app/eventyay/cfp/views/auth.py b/app/eventyay/cfp/views/auth.py index 53278db0cb..2b295cca20 100644 --- a/app/eventyay/cfp/views/auth.py +++ b/app/eventyay/cfp/views/auth.py @@ -41,8 +41,8 @@ class LoginView(GenericLoginView): template_name = 'cfp/event/login.html' def dispatch(self, request, *args, **kwargs): - if not request.event.is_public: - logger.info('Event %s is not public. Blocking access.', request.event.slug) + if not request.event.live: + logger.info('Event %s is not live. Blocking access.', request.event.slug) raise Http404() return super().dispatch(request, *args, **kwargs) diff --git a/app/eventyay/common/middleware/domains.py b/app/eventyay/common/middleware/domains.py index c8582ad05c..75d5915afa 100644 --- a/app/eventyay/common/middleware/domains.py +++ b/app/eventyay/common/middleware/domains.py @@ -95,7 +95,7 @@ def process_request(self, request): ).order_by('-date_from') if events: request.uses_custom_domain = True - public_event = events.filter(is_public=True).first() + public_event = events.filter(live=True).first() if public_event: return redirect(public_event.urls.base.full()) # This domain is configured for an event, but does not have a public event diff --git a/app/eventyay/common/templates/common/base.html b/app/eventyay/common/templates/common/base.html index 83f262ffac..398b3fa297 100644 --- a/app/eventyay/common/templates/common/base.html +++ b/app/eventyay/common/templates/common/base.html @@ -72,7 +72,7 @@ {{ request.event.name }} {% endif %} - {% if request.event and not request.event.is_public and not is_html_export %} + {% if request.event and not request.event.live and not is_html_export %}
{% blocktranslate trimmed %} diff --git a/app/eventyay/event/stages.py b/app/eventyay/event/stages.py index e3f37ec010..6cd4b6eafe 100644 --- a/app/eventyay/event/stages.py +++ b/app/eventyay/event/stages.py @@ -9,7 +9,7 @@ def _is_in_preparation(event): - return not event.is_public and now() <= event.date_from + return not event.live and now() <= event.date_from def _is_cfp_open(event): diff --git a/app/eventyay/orga/context_processors.py b/app/eventyay/orga/context_processors.py index fd89908d69..d9b1b2de52 100644 --- a/app/eventyay/orga/context_processors.py +++ b/app/eventyay/orga/context_processors.py @@ -66,7 +66,7 @@ def orga_events(request): context['html_head'] = ''.join(collect_signal(html_head, {'sender': request.event, 'request': request})) if ( - not request.event.is_public + not request.event.live and request.event.custom_domain and request.user.has_perm('base.view_event', request.event) ): diff --git a/app/eventyay/orga/templates/orga/base.html b/app/eventyay/orga/templates/orga/base.html index fb46fc09b3..19e425322a 100644 --- a/app/eventyay/orga/templates/orga/base.html +++ b/app/eventyay/orga/templates/orga/base.html @@ -88,7 +88,7 @@