From 96aa04356e74e2d128d6522431202b647991d28e Mon Sep 17 00:00:00 2001 From: George Cushen Date: Sat, 10 Jan 2026 18:45:01 +0000 Subject: [PATCH] fix: respect new event start/end fields when filtering past/future in collection block --- modules/blox/blox/collection/block.html | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/modules/blox/blox/collection/block.html b/modules/blox/blox/collection/block.html index 08b6d8df..97da9bb1 100644 --- a/modules/blox/blox/collection/block.html +++ b/modules/blox/blox/collection/block.html @@ -182,11 +182,31 @@ {{ end }} {{ $exclude_past := partial "functions/coerce_bool" (dict "value" (index $filters "exclude_past") "default" false) }} {{ if $exclude_past }} - {{ $query = where $query "Date" ">=" now }} + {{/* Use event_end -> event_start -> Date to decide if an item is past */}} + {{ $filtered := slice }} + {{ range $query }} + {{ $start := .Date }} + {{ with .Params.event_start }}{{ $start = . }}{{ end }} + {{ $end := $start }} + {{ with .Params.event_end }}{{ $end = . }}{{ end }} + {{ if ge $end now }} + {{ $filtered = $filtered | append . }} + {{ end }} + {{ end }} + {{ $query = $filtered }} {{ end }} {{ $exclude_future := partial "functions/coerce_bool" (dict "value" (index $filters "exclude_future") "default" false) }} {{ if $exclude_future }} - {{ $query = where $query "Date" "<" now }} + {{/* Use event_start -> Date to drop future/unscheduled items */}} + {{ $filtered := slice }} + {{ range $query }} + {{ $start := .Date }} + {{ with .Params.event_start }}{{ $start = . }}{{ end }} + {{ if lt $start now }} + {{ $filtered = $filtered | append . }} + {{ end }} + {{ end }} + {{ $query = $filtered }} {{ end }} {{ $count := len $query }}