diff --git a/project/services/event.py b/project/services/event.py index 1adb281..6e13cb2 100644 --- a/project/services/event.py +++ b/project/services/event.py @@ -102,6 +102,12 @@ def fill_event_filter(event_filter, params: EventSearchParams): public_stati = params.public_status else: # pragma: no cover public_stati = [params.public_status] + elif params.can_read_private_events: + public_stati = [ + PublicStatus.published, + PublicStatus.planned, + PublicStatus.draft, + ] else: public_stati = [ PublicStatus.published, diff --git a/project/templates/planning/list.html b/project/templates/planning/list.html index e2a8c92..2a24f08 100644 --- a/project/templates/planning/list.html +++ b/project/templates/planning/list.html @@ -84,7 +84,7 @@ $( function() { - + {{ render_field_with_errors(form.category_id, ri="multicheckbox-inline", formrow="1") }} {{ render_field_with_errors(form.postal_code, formrow="1") }} diff --git a/tests/views/test_manage.py b/tests/views/test_manage.py index db0466e..11b337b 100644 --- a/tests/views/test_manage.py +++ b/tests/views/test_manage.py @@ -97,6 +97,8 @@ def test_admin_unit_event_reviews(client, seeder: Seeder, utils: UtilActions): def test_admin_unit_events(client, seeder: Seeder, utils: UtilActions): user_id, admin_unit_id = seeder.setup_base(admin_unit_verified=False) + draft_id = seeder.create_event(admin_unit_id, draft=True) + planned_id = seeder.create_event(admin_unit_id, planned=True) utils.get_endpoint_ok( "manage_admin_unit_events", @@ -105,12 +107,14 @@ def test_admin_unit_events(client, seeder: Seeder, utils: UtilActions): date_to="2021-10-03", ) - event_id = seeder.create_event(admin_unit_id, draft=True) response = utils.get_endpoint_ok("manage_admin_unit_events", id=admin_unit_id) - event_url = utils.get_url("event", event_id=event_id) + event_url = utils.get_url("event", event_id=draft_id) utils.assert_response_contains(response, event_url) + planned_url = utils.get_url("event", event_id=planned_id) + utils.assert_response_contains(response, planned_url) + def test_admin_unit_events_invalidDateFormat( client, seeder: Seeder, utils: UtilActions