From 1537810efad0f704c26dd25f92fbbf2ccc803178 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 8 Aug 2025 20:39:37 +0300 Subject: [PATCH] Add element_pages_count helper --- app/controllers/changesets_controller.rb | 4 ++++ app/views/changesets/_paging_nav.html.erb | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb index af853937c..7842b2e2c 100644 --- a/app/controllers/changesets_controller.rb +++ b/app/controllers/changesets_controller.rb @@ -168,6 +168,10 @@ class ChangesetsController < ApplicationController @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :order => [:relation_id, :version], :per_page => ELEMENTS_PER_PAGE, :parameter => "relation_page") end + helper_method def element_pages_count(elements_count) + [1, 1 + ((elements_count - 1) / ELEMENTS_PER_PAGE)].max + end + helper_method def element_range_values(elements_count, page) { :x => (ELEMENTS_PER_PAGE * (page - 1)) + 1, :y => [ELEMENTS_PER_PAGE * page, elements_count].min, diff --git a/app/views/changesets/_paging_nav.html.erb b/app/views/changesets/_paging_nav.html.erb index 21db8aa82..89dd37c2d 100644 --- a/app/views/changesets/_paging_nav.html.erb +++ b/app/views/changesets/_paging_nav.html.erb @@ -1,11 +1,12 @@ -<% if pages.page_count == 1 %> +<% pages_count = element_pages_count pages.item_count %> +<% if pages_count == 1 %>

<%= t ".#{type.pluralize}_title" %> <%= pages.item_count %>

-<% elsif pages.page_count > 1 %> +<% elsif pages_count > 1 %>

<%= t ".#{type.pluralize}_title" %> -- 2.39.5