From 31fcc68f4e2f2a6a6138f1875cfec5e4e011181f Mon Sep 17 00:00:00 2001 From: Daniel Grams Date: Wed, 5 Jan 2022 20:07:32 +0100 Subject: [PATCH] None-Exception in Widget #352 --- project/templates/widget/event_date/list.html | 8 ++++++-- tests/views/test_widget.py | 9 +++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/project/templates/widget/event_date/list.html b/project/templates/widget/event_date/list.html index d0b33d3..56cc3a2 100644 --- a/project/templates/widget/event_date/list.html +++ b/project/templates/widget/event_date/list.html @@ -93,7 +93,9 @@
{{ date.event.name }}{{ render_event_warning_pills(date.event) }}
{{ render_event_date_instance(date.start, date.allday, 'medium') }}
-

{{ date.event.description | truncate(200) }}

+ {% if date.event.description %} +

{{ date.event.description | truncate(200) }}

+ {% endif %} {% if date.event.admin_unit_id != params.admin_unit_id %} {{ date.event.admin_unit.name }} {% else %} @@ -127,7 +129,9 @@
{{ date.event.name }}{{ render_event_warning_pills(date.event) }}
{{ render_event_date_instance(date.start, date.allday, 'medium') }}
-

{{ date.event.description | truncate(100) }}

+ {% if date.event.description %} +

{{ date.event.description | truncate(100) }}

+ {% endif %} {% if date.event.admin_unit_id != params.admin_unit_id %} {{ date.event.admin_unit.name }} {% else %} diff --git a/tests/views/test_widget.py b/tests/views/test_widget.py index ce085b0..ad06b4e 100644 --- a/tests/views/test_widget.py +++ b/tests/views/test_widget.py @@ -87,6 +87,15 @@ def test_event_dates_oneDay(client, seeder, utils): utils.assert_response_contains(response, name) +def test_event_dates_noneDescription(client, seeder, utils): + _, admin_unit_id = seeder.setup_base() + au_short_name = "meinecrew" + seeder.create_event(admin_unit_id, description=None) + + url = utils.get_url("widget_event_dates", au_short_name=au_short_name) + utils.get_ok(url) + + def test_event_date(client, seeder, utils, app, db): user_id, admin_unit_id = seeder.setup_base(log_in=False) seeder.create_event(admin_unit_id)