potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'exclude-happening-events' into 'master'

Browse source 
Currently happening events are not future events

Closes #220

See merge request framasoft/mobilizon!460
This commit is contained in:
Thomas Citharel 2020-06-10 10:03:36 +02:00
parent 0702878924 c4cdfd9857
commit 23a5ffd3a1
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/mobilizon/events/events.ex
View file

@ -1506,11 +1506,10 @@ 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, from(q in query,
where: q.begins_on > ^DateTime.utc_now() or q.ends_on > ^DateTime.utc_now() where: q.begins_on > ^DateTime.utc_now()
) )
end end