PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-19 20:04:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix gallery page ordering bug (derpibooru/philomena#195)

Browse source
This commit is contained in:
byte[] 2020-09-14 19:19:14 -04:00
parent da38408ef4
commit 96f1005255
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/philomena_web/controllers/gallery_controller.ex
View file

@ -46,12 +46,15 @@ defmodule PhilomenaWeb.GalleryController do
user = conn.assigns.current_user user = conn.assigns.current_user
query = "gallery_id:#{gallery.id}" query = "gallery_id:#{gallery.id}"
params = conn =
Map.merge(conn.params, %{ update_in(
"q" => query, conn.params,
"sf" => "gallery_id:#{gallery.id}", &Map.merge(&1, %{
"sd" => position_order(gallery) "q" => query,
}) "sf" => "gallery_id:#{gallery.id}",
"sd" => position_order(gallery)
})
)
{:ok, {images, _tags}} = ImageLoader.search_string(conn, query) {:ok, {images, _tags}} = ImageLoader.search_string(conn, query)
{gallery_prev, gallery_next} = prev_next_page_images(conn, query) {gallery_prev, gallery_next} = prev_next_page_images(conn, query)
@ -75,7 +78,6 @@ defmodule PhilomenaWeb.GalleryController do
conn conn
|> NotificationCountPlug.call([]) |> NotificationCountPlug.call([])
|> Map.put(:params, params)
|> assign(:clientside_data, gallery_images: gallery_json) |> assign(:clientside_data, gallery_images: gallery_json)
|> render("show.html", |> render("show.html",
title: "Showing Gallery", title: "Showing Gallery",