From 39ff35c089d3d02058becb26ba9a0936e136fd52 Mon Sep 17 00:00:00 2001 From: SeinopSys Date: Sun, 19 Jul 2020 20:57:01 +0200 Subject: [PATCH] Fix tag changes pagination not preserving added query param Closes #9 --- .../fingerprint_profile/tag_change/index.html.slime | 2 +- .../templates/image/tag_change/index.html.slime | 7 ++++--- .../templates/ip_profile/tag_change/index.html.slime | 2 +- .../templates/profile/tag_change/index.html.slime | 2 +- .../templates/tag/tag_change/index.html.slime | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/philomena_web/templates/fingerprint_profile/tag_change/index.html.slime b/lib/philomena_web/templates/fingerprint_profile/tag_change/index.html.slime index 6bd0ca55..c69d2d9b 100644 --- a/lib/philomena_web/templates/fingerprint_profile/tag_change/index.html.slime +++ b/lib/philomena_web/templates/fingerprint_profile/tag_change/index.html.slime @@ -7,7 +7,7 @@ h1 .block .block__header - span.block__header_title + span.block__header__title | Display only: = link "Removed", to: Routes.fingerprint_profile_tag_change_path(@conn, :index, @fingerprint, added: 0) diff --git a/lib/philomena_web/templates/image/tag_change/index.html.slime b/lib/philomena_web/templates/image/tag_change/index.html.slime index 2aaaae54..e2bdb979 100644 --- a/lib/philomena_web/templates/image/tag_change/index.html.slime +++ b/lib/philomena_web/templates/image/tag_change/index.html.slime @@ -5,15 +5,16 @@ h1 = @image.id - route = fn p -> Routes.image_tag_change_path(@conn, :index, @image, p) end -- pagination = render PhilomenaWeb.PaginationView, "_pagination.html", page: @tag_changes, route: route, conn: @conn +- params = if @conn.params["added"] do [added: @conn.params["added"]] else nil end +- pagination = render PhilomenaWeb.PaginationView, "_pagination.html", page: @tag_changes, route: route, conn: @conn, params: params .block .block__header - span.block__header_title + span.block__header__title | Display only: = link "Removed", to: Routes.image_tag_change_path(@conn, :index, @image, added: 0) = link "Added", to: Routes.image_tag_change_path(@conn, :index, @image, added: 1) = link "All", to: Routes.image_tag_change_path(@conn, :index, @image) - = render PhilomenaWeb.TagChangeView, "index.html", conn: @conn, tag_changes: @tag_changes, pagination: pagination \ No newline at end of file + = render PhilomenaWeb.TagChangeView, "index.html", conn: @conn, tag_changes: @tag_changes, pagination: pagination diff --git a/lib/philomena_web/templates/ip_profile/tag_change/index.html.slime b/lib/philomena_web/templates/ip_profile/tag_change/index.html.slime index b66c28ff..68ce6797 100644 --- a/lib/philomena_web/templates/ip_profile/tag_change/index.html.slime +++ b/lib/philomena_web/templates/ip_profile/tag_change/index.html.slime @@ -7,7 +7,7 @@ h1 .block .block__header - span.block__header_title + span.block__header__title | Display only: = link "Removed", to: Routes.ip_profile_tag_change_path(@conn, :index, to_string(@ip), added: 0) diff --git a/lib/philomena_web/templates/profile/tag_change/index.html.slime b/lib/philomena_web/templates/profile/tag_change/index.html.slime index 97331e05..ae2663df 100644 --- a/lib/philomena_web/templates/profile/tag_change/index.html.slime +++ b/lib/philomena_web/templates/profile/tag_change/index.html.slime @@ -8,7 +8,7 @@ h1 .block .block__header - span.block__header_title + span.block__header__title | Display only: = link "Removed", to: Routes.profile_tag_change_path(@conn, :index, @user, added: 0) diff --git a/lib/philomena_web/templates/tag/tag_change/index.html.slime b/lib/philomena_web/templates/tag/tag_change/index.html.slime index e00fc64d..4c0a0e58 100644 --- a/lib/philomena_web/templates/tag/tag_change/index.html.slime +++ b/lib/philomena_web/templates/tag/tag_change/index.html.slime @@ -8,7 +8,7 @@ h1 .block .block__header - span.block__header_title + span.block__header__title | Display only: = link "Removed", to: Routes.tag_tag_change_path(@conn, :index, @tag, added: 0)