From d780fcb86423952e1aaf26818a7602e2315c940a Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Fri, 8 Aug 2025 20:29:41 +0300
Subject: [PATCH] Add element_range_values helper

---
 app/controllers/changesets_controller.rb  | 6 ++++++
 app/views/changesets/_paging_nav.html.erb | 8 ++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index 2fff0aca4..af853937c 100644
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -167,4 +167,10 @@ class ChangesetsController < ApplicationController
   def load_relations
     @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_range_values(elements_count, page)
+    { :x => (ELEMENTS_PER_PAGE * (page - 1)) + 1,
+      :y => [ELEMENTS_PER_PAGE * page, elements_count].min,
+      :count => elements_count }
+  end
 end
diff --git a/app/views/changesets/_paging_nav.html.erb b/app/views/changesets/_paging_nav.html.erb
index 9fa23f670..21db8aa82 100644
--- a/app/views/changesets/_paging_nav.html.erb
+++ b/app/views/changesets/_paging_nav.html.erb
@@ -9,17 +9,13 @@
   <h4 class="fs-5">
     <%= t ".#{type.pluralize}_title" %>
     <span class="badge count-number">
-      <%= t ".range", :x => pages.current_page.first_item,
-                      :y => pages.current_page.last_item,
-                      :count => pages.item_count %>
+      <%= t ".range", **element_range_values(pages.item_count, pages.current_page.number) %>
     </span>
   </h4>
 
   <%= sidebar_classic_pagination(pages, "#{type}_page") do |page|
         {
-          :title => t(".#{type.pluralize}_paginated", :x => page.first_item,
-                                                      :y => page.last_item,
-                                                      :count => pages.item_count),
+          :title => t(".#{type.pluralize}_paginated", **element_range_values(pages.item_count, page.number)),
           :data => { :turbo => "true" }
         }
       end %>
-- 
2.39.5