From 341aa8aed01d4ec80070575db2c0a720916a93cb Mon Sep 17 00:00:00 2001 From: Becky Smith Date: Mon, 1 Jan 2024 15:44:07 +0000 Subject: [PATCH] Show active blocks on event type admin page --- booking/templatetags/bookingtags.py | 8 +++++++- templates/studioadmin/setup_event_types.html | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/booking/templatetags/bookingtags.py b/booking/templatetags/bookingtags.py index 602dbcac..389e6b0a 100644 --- a/booking/templatetags/bookingtags.py +++ b/booking/templatetags/bookingtags.py @@ -452,4 +452,10 @@ def has_permission(allowed_group, user): # pragma: no cover @register.filter def event_types_for_group(allowed_group): - return mark_safe("
".join([f"{event_type.subtype} ({event_type.readable_name})" for event_type in allowed_group.event_types.visible()])) \ No newline at end of file + return mark_safe("
".join([f"{event_type.subtype} ({event_type.readable_name})" for event_type in allowed_group.event_types.visible()])) + + +@register.filter +def active_block_types(event_type): + active_bts = event_type.blocktype_set.filter(active=True) + return mark_safe("
".join([str(active_bt) for active_bt in active_bts])) diff --git a/templates/studioadmin/setup_event_types.html b/templates/studioadmin/setup_event_types.html index 0b65deef..7462fc42 100644 --- a/templates/studioadmin/setup_event_types.html +++ b/templates/studioadmin/setup_event_types.html @@ -17,6 +17,7 @@

Event Types

Name (subtype) Event Type Allowed Group + Purchaseable Blocks @@ -25,6 +26,7 @@

Event Types

{{ event_type.subtype }} {{ event_type.readable_name }} {% if event_type.allowed_group %}{{ event_type.allowed_group }}{% endif %} + {{ event_type|active_block_types }} {% endfor %}