PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2024-11-27 13:47:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

prevent params drop on admin user pagination (derpibooru/philomena#153)

Browse source
This commit is contained in:
byte[] 2020-09-14 19:44:47 -04:00
parent ff5c01ce07
commit 218607b208
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/philomena_web/templates/admin/user/index.html.slime
View file

@ -10,7 +10,7 @@ h1 Users
=> link "2FA users", to: Routes.admin_user_path(@conn, :index, twofactor: 1) => link "2FA users", to: Routes.admin_user_path(@conn, :index, twofactor: 1)
- route = fn p -> Routes.admin_user_path(@conn, :index, p) end - route = fn p -> Routes.admin_user_path(@conn, :index, p) end
- pagination = render PhilomenaWeb.PaginationView, "_pagination.html", page: @users, route: route, conn: @conn, params: [q: @conn.params["q"]] - pagination = render PhilomenaWeb.PaginationView, "_pagination.html", page: @users, route: route, conn: @conn, params: page_params(@conn.params)
.block .block
.block__header .block__header

15
lib/philomena_web/views/admin/user_view.ex
View file

@ -1,6 +1,21 @@
defmodule PhilomenaWeb.Admin.UserView do defmodule PhilomenaWeb.Admin.UserView do
use PhilomenaWeb, :view use PhilomenaWeb, :view
def page_params(params) do
[]
|> page_param(params, "q", :q)
|> page_param(params, "staff", :staff)
|> page_param(params, "twofactor", :twofactor)
end
defp page_param(list, params, key, key_atom) do
case params[key] do
nil -> list
"" -> list
val -> [{key_atom, val} | list]
end
end
def checkbox_mapper(form, field, input_opts, role, _label_opts, _opts) do def checkbox_mapper(form, field, input_opts, role, _label_opts, _opts) do
input_id = "user_roles_#{role.id}" input_id = "user_roles_#{role.id}"
label_opts = [for: input_id] label_opts = [for: input_id]