From 96f1005255602e1541a780c04b1dbb29d3329088 Mon Sep 17 00:00:00 2001 From: "byte[]" Date: Mon, 14 Sep 2020 19:19:14 -0400 Subject: [PATCH] fix gallery page ordering bug (derpibooru/philomena#195) --- .../controllers/gallery_controller.ex | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/philomena_web/controllers/gallery_controller.ex b/lib/philomena_web/controllers/gallery_controller.ex index f50d58c8..4783f223 100644 --- a/lib/philomena_web/controllers/gallery_controller.ex +++ b/lib/philomena_web/controllers/gallery_controller.ex @@ -46,12 +46,15 @@ defmodule PhilomenaWeb.GalleryController do user = conn.assigns.current_user query = "gallery_id:#{gallery.id}" - params = - Map.merge(conn.params, %{ - "q" => query, - "sf" => "gallery_id:#{gallery.id}", - "sd" => position_order(gallery) - }) + conn = + update_in( + conn.params, + &Map.merge(&1, %{ + "q" => query, + "sf" => "gallery_id:#{gallery.id}", + "sd" => position_order(gallery) + }) + ) {:ok, {images, _tags}} = ImageLoader.search_string(conn, query) {gallery_prev, gallery_next} = prev_next_page_images(conn, query) @@ -75,7 +78,6 @@ defmodule PhilomenaWeb.GalleryController do conn |> NotificationCountPlug.call([]) - |> Map.put(:params, params) |> assign(:clientside_data, gallery_images: gallery_json) |> render("show.html", title: "Showing Gallery",