lucaspalomodevelop/eventcally
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/eventcally.git synced 2026-03-13 00:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix visibility for PublicStatus.planned #553

Browse Source
This commit is contained in:
Daniel Grams 2023-10-25 22:08:29 +02:00
parent ed5ffd508d
commit d7f780e6b1
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project/services/event.py
View File

@ -102,6 +102,12 @@ def fill_event_filter(event_filter, params: EventSearchParams):
public_stati = params.public_status public_stati = params.public_status
else: # pragma: no cover else: # pragma: no cover
public_stati = [params.public_status] public_stati = [params.public_status]
elif params.can_read_private_events:
public_stati = [
PublicStatus.published,
PublicStatus.planned,
PublicStatus.draft,
]
else: else:
public_stati = [ public_stati = [
PublicStatus.published, PublicStatus.published,

2
project/templates/planning/list.html
View File

@ -84,7 +84,7 @@ $( function() {
<input id="page" name="page" type="hidden" value="1" /> <input id="page" name="page" type="hidden" value="1" />
<input id="per_page" name="per_page" type="hidden" value="50" /> <input id="per_page" name="per_page" type="hidden" value="50" />
<input name="public_status" type="hidden" value="published" /> <input name="public_status" type="hidden" value="published" />
<input name="public_status" type="hidden" value="published" /> <input name="public_status" type="hidden" value="planned" />
{{ render_field_with_errors(form.category_id, ri="multicheckbox-inline", formrow="1") }} {{ render_field_with_errors(form.category_id, ri="multicheckbox-inline", formrow="1") }}
{{ render_field_with_errors(form.postal_code, formrow="1") }} {{ render_field_with_errors(form.postal_code, formrow="1") }}

8
tests/views/test_manage.py
View File

@ -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): def test_admin_unit_events(client, seeder: Seeder, utils: UtilActions):
user_id, admin_unit_id = seeder.setup_base(admin_unit_verified=False) 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( utils.get_endpoint_ok(
"manage_admin_unit_events", "manage_admin_unit_events",
@ -105,12 +107,14 @@ def test_admin_unit_events(client, seeder: Seeder, utils: UtilActions):
date_to="2021-10-03", 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) 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) 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( def test_admin_unit_events_invalidDateFormat(
client, seeder: Seeder, utils: UtilActions client, seeder: Seeder, utils: UtilActions