From 47cd24e506a7e821333756702f52e5bb660dca6c Mon Sep 17 00:00:00 2001 From: "byte[]" Date: Thu, 12 Dec 2019 17:15:59 -0500 Subject: [PATCH] calculate pagination info correctly --- lib/philomena/users/ability.ex | 2 ++ .../templates/pagination/_pagination_info.html.slime | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/philomena/users/ability.ex b/lib/philomena/users/ability.ex index 7a658c94..b11799cf 100644 --- a/lib/philomena/users/ability.ex +++ b/lib/philomena/users/ability.ex @@ -65,6 +65,8 @@ defimpl Canada.Can, for: [Atom, Philomena.Users.User] do def can?(%User{role: "moderator"}, :index, DnpEntry), do: true def can?(%User{role: "moderator"}, :edit, %DnpEntry{}), do: true def can?(%User{role: "moderator"}, :update, %DnpEntry{}), do: true + def can?(%User{role: "moderator"}, :show_reason, %DnpEntry{}), do: true + def can?(%User{role: "moderator"}, :show_feedback, %DnpEntry{}), do: true # # Assistants can... diff --git a/lib/philomena_web/templates/pagination/_pagination_info.html.slime b/lib/philomena_web/templates/pagination/_pagination_info.html.slime index 8d59aedd..2cde8fb9 100644 --- a/lib/philomena_web/templates/pagination/_pagination_info.html.slime +++ b/lib/philomena_web/templates/pagination/_pagination_info.html.slime @@ -3,7 +3,7 @@ => pluralize("result", "results", @page.total_entries) strong - => max(((@page.page_number - 1) * @page.page_size) - 1, 1) + => max(((@page.page_number - 1) * @page.page_size), 0) + 1 ' - => min(@page.page_number * @page.page_size, @page.total_entries) ' of @@ -13,4 +13,4 @@ ' total - else - ' No results found \ No newline at end of file + ' No results found