From 27b0bec870d9a862ae5f854a8a892b869f41bcff Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Fri, 24 Nov 2023 08:43:34 +0100 Subject: [PATCH] context_processors: prevent a null station error when no default station is defined --- aircox/context_processors/__init__.py | 3 ++- aircox/forms.py | 2 ++ aircox/templates/aircox/program_form.html | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/aircox/context_processors/__init__.py b/aircox/context_processors/__init__.py index e79119a..7147c88 100644 --- a/aircox/context_processors/__init__.py +++ b/aircox/context_processors/__init__.py @@ -1,3 +1,4 @@ def station(request): station = request.station - return {"station": station, "audio_streams": station.streams} + audio_streams = station.streams if station else None + return {"station": station, "audio_streams": audio_streams} diff --git a/aircox/forms.py b/aircox/forms.py index 9555119..2c71797 100644 --- a/aircox/forms.py +++ b/aircox/forms.py @@ -1,6 +1,7 @@ from django import forms from django.forms import ModelForm, ImageField +from ckeditor.fields import RichTextField from filer.models.imagemodels import Image from aircox.models import Comment, Program @@ -21,6 +22,7 @@ class CommentForm(ModelForm): class ProgramForm(ModelForm): + content = RichTextField() new_cover = ImageField(required=False) class Meta: diff --git a/aircox/templates/aircox/program_form.html b/aircox/templates/aircox/program_form.html index 0116ea4..a2aaa4f 100644 --- a/aircox/templates/aircox/program_form.html +++ b/aircox/templates/aircox/program_form.html @@ -2,6 +2,13 @@ {% load static i18n humanize honeypot aircox %} +{% block head_extra %} + {{ form.media }} +{% endblock %} + +{% block init-scripts %} +{% endblock %} + {% block top-nav-tools %}