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

Merge branch 'fix-close-events-order' into 'master' 

Fix close events order

See merge request framasoft/mobilizon!866
This commit is contained in:
Thomas Citharel 2021-03-18 09:40:25 +00:00
parent 89ff49cb00 cfa94851fa
commit f68cbb18b0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -522,7 +522,7 @@ defmodule Mobilizon.Events do
|> filter_local_or_from_followed_instances_events() |> filter_local_or_from_followed_instances_events()
|> filter_public_visibility() |> filter_public_visibility()
|> event_order_begins_on_asc() |> event_order_begins_on_asc()
|> Page.build_page(page, limit) |> Page.build_page(page, limit, :begins_on)
end end
@doc """ @doc """
@ -1342,12 +1342,12 @@ defmodule Mobilizon.Events do
@spec events_for_search_query(String.t()) :: Ecto.Query.t() @spec events_for_search_query(String.t()) :: Ecto.Query.t()
defp events_for_search_query("") do defp events_for_search_query("") do
Event Event
|> distinct([e], e.id) |> distinct([e], asc: e.begins_on, asc: e.id)
end end
defp events_for_search_query(search_string) do defp events_for_search_query(search_string) do
from(event in Event, from(event in Event,
distinct: event.id, distinct: [asc: event.begins_on, asc: event.id],
join: id_and_rank in matching_event_ids_and_ranks(search_string), join: id_and_rank in matching_event_ids_and_ranks(search_string),
on: id_and_rank.id == event.id on: id_and_rank.id == event.id
) )