diff --git a/calendar_utils/models.py b/calendar_utils/models.py index 07648403c812c8f5b99b7a0b5ed267d21ad00a5e..a0ecc9182bd6c24c9ad1a059d3e2f70856df74a5 100644 --- a/calendar_utils/models.py +++ b/calendar_utils/models.py @@ -8,6 +8,7 @@ from django.core.serializers.json import DjangoJSONEncoder from django.core.validators import URLValidator, ValidationError from django.db import models, transaction from django.utils.timezone import now +from django.utils.html import escape from .icalevents import icalevents from .parser import process_event_list @@ -132,7 +133,7 @@ class CalendarMixin(models.Model): calendar_format_events.append(parsed_event) - return json.dumps(calendar_format_events) + return escape(json.dumps(calendar_format_events)) def save(self, *args, **kwargs): # create or update related Calendar diff --git a/district/models.py b/district/models.py index 8b08fa37869c900c992644e26ea9c71fa2dfac0c..5f699860eab90fff1c85c32928c242ee40ac0f2d 100644 --- a/district/models.py +++ b/district/models.py @@ -808,12 +808,12 @@ class DistrictCenterPage( desc = None - if self.perex: + if hasattr(self, "perex") and self.perex: desc = self.perex - elif self.text: + elif hasattr(self, "text") and self.text: desc = trim_to_length(strip_all_html_tags(self.text)) - return desc + return "" class DistrictNewProgramPage(MainProgramPageMixin): diff --git a/district/templates/district/district_calendar_page.html b/district/templates/district/district_calendar_page.html index 4a037ffce1ca3340c94087553b53c6348a71bcc2..1ee980a5a6adbe5b44afde286217882db5697028 100644 --- a/district/templates/district/district_calendar_page.html +++ b/district/templates/district/district_calendar_page.html @@ -5,13 +5,15 @@ {% endblock %} {% block inner_content %} - <div class="__js-root __inner-content"> - <ui-full-calendar - {% if page.calendar_url %} - events='{{ page.get_fullcalendar_data|safe }}' - {% else %} - events='{{ page.root_page.get_fullcalendar_data|safe }}' - {% endif %} - ></ui-full-calendar> + <div class="container--wide"> + <div class="__js-root __inner-content"> + <ui-full-calendar + {% if page.calendar_url %} + events='{{ page.get_fullcalendar_data|safe }}' + {% else %} + events='{{ page.root_page.get_fullcalendar_data|safe }}' + {% endif %} + ></ui-full-calendar> + </div> </div> {% endblock %}