Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
25
0
Fork 0
Code Issues Pull Requests Releases Activity

Make sure featured events have currently happening events

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-10-09 16:37:39 +02:00
parent 68c8017141
commit 5b1b7ee164
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/mobilizon/events/events.ex
View File

@ -1433,9 +1433,12 @@ defmodule Mobilizon.Events do
from(e in query, where: e.draft == ^is_draft) from(e in query, where: e.draft == ^is_draft)
end end
# Currently happening events are also future events
@spec filter_future_events(Ecto.Query.t(), boolean) :: Ecto.Query.t() @spec filter_future_events(Ecto.Query.t(), boolean) :: Ecto.Query.t()
defp filter_future_events(query, true) do defp filter_future_events(query, true) do
from(q in query, where: q.begins_on > ^DateTime.utc_now()) from(q in query,
where: q.begins_on > ^DateTime.utc_now() or q.ends_on > ^DateTime.utc_now()
)
end end
defp filter_future_events(query, false), do: query defp filter_future_events(query, false), do: query