Skip to content

AO3-7557 Fix 500 error due to pagy overflow in admin posts index #5951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bilka2 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

AO3-7557 Fix 500 error due to pagy overflow in admin posts index #5951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c150b6d
AO3-7557 Add test for pagy overflow
Bilka2 Jul 28, 2026
40b419c
AO3-7557 Fix 500 error due to pagy overflow in admin posts index
Bilka2 Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions app/views/admin_posts/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,33 @@
<% else %>
<div class="primary header module">
<!--Descriptive page name, messages and instructions-->
<h2 class="heading"><%= link_to ts("AO3 News"), admin_posts_path %></h2>
<h2 class="heading"><%= link_to t(".page_heading"), admin_posts_path %></h2>
<div class="icon"></div>
<!--/descriptions-->

<!--subnav-->
<ul class="navigation actions" role="navigation">
<li><%= render 'filters' %></li>
<ul class="navigation actions">
<li><%= render "filters" %></li>
<li><%= link_to_rss admin_posts_path(:rss, language_id: @language&.short) %></li>
</ul>
<!--/subnav-->
</div>
<!--main content-->
<% @admin_posts.each do |admin_post| %>
<div class="news module group" role="article">
<%= render "admin_post", admin_post: admin_post %>
<!-- BEGIN comment section -->
<h3 class="landmark heading"><%= ts("Comment") %></h3>
<ul class="actions" role="navigation">
<% if admin_post.count_visible_comments > 0 %>
<li><%= link_to (admin_post.count_visible_comments == 1 ?
ts("Read %{comment_count} Comment", comment_count: admin_post.count_visible_comments.to_s) :
ts("Read %{comment_count} Comments", comment_count: admin_post.count_visible_comments.to_s)),
admin_post_path(id: admin_post.id, anchor: "comments", show_comments: true) %></li>
<% end %>
</ul>
<!-- END comment section -->
</div>
<% if @admin_posts.present? %>
<% @admin_posts.each do |admin_post| %>
<div class="news module group" role="article">
<%= render "admin_post", admin_post: admin_post %>
<!-- BEGIN comment section -->
<h3 class="landmark heading"><%= t(".landmark") %></h3>
<ul class="actions">
<% if admin_post.count_visible_comments > 0 %>
<li><%= link_to t(".read_comments", count: admin_post.count_visible_comments),
admin_post_path(id: admin_post.id, anchor: "comments", show_comments: true) %></li>
<% end %>
</ul>
<!-- END comment section -->
</div>
<% end %>
<% end %>
<!--/content-->
<hr class="clear" />
Expand Down
5 changes: 5 additions & 0 deletions config/locales/views/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,12 @@ en:
page_heading: AO3 News Drafts
page_title: AO3 News Drafts
index:
landmark: Comment
page_heading: AO3 News
page_title: AO3 News
read_comments:
one: Read %{count} Comment
other: Read %{count} Comments
posting_fieldset:
actions:
cancel: Cancel
Expand Down
14 changes: 14 additions & 0 deletions features/admins/admin_post_news.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,20 @@ Feature: Admin Actions to Post News
And "quotes" should be selected within "Tag"
And "Deutsch" should be selected within "Language"

Scenario: Admin post list is empty if page parameter is too large
Given the admin post "first"
And it is currently 1 second from now
And the admin post "second"
And there is 1 admin post per page
When I go to the admin-posts page
Then I should see "second"
And I should see "2" within ".pagination"
But I should not see "first"
When there are 20 admin posts per page
And I follow "2" within ".pagination"
Then I should see "AO3 News"
But I should not see "first"

Scenario: Translation of an admin post keeps tags of original post
Given I have posted an admin post with tags "original1, original2"
And basic languages
Expand Down
4 changes: 4 additions & 0 deletions features/step_definitions/admin_steps.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,10 @@
admin_post.update_attribute(:moderated_commenting_enabled, true)
end

When "there is/are {int} admin post(s) per page" do |amount|
allow_any_instance_of(ApplicationController).to receive(:pagy_get_limit).and_return(amount)
end

Given "an abuse ticket ID exists" do
ticket = {
"departmentId" => ArchiveConfig.ABUSE_ZOHO_DEPARTMENT_ID,
Expand Down
Loading