From 8f86512971bf00a96b15785fc0af2ce599e4a8d1 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 8 Aug 2025 20:53:32 +0300 Subject: [PATCH] Read cached changeset element numbers --- app/controllers/changesets_controller.rb | 6 +++--- test/system/changeset_elements_test.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb index ff6397a96..caaed2c38 100644 --- a/app/controllers/changesets_controller.rb +++ b/app/controllers/changesets_controller.rb @@ -157,7 +157,7 @@ class ChangesetsController < ApplicationController end def load_nodes - @nodes_count = @changeset.old_nodes.count + @nodes_count = @changeset.actual_num_changed_nodes @current_node_page = params[:node_page].to_i.clamp(1, element_pages_count(@nodes_count)) @nodes = @changeset.old_nodes .order(:node_id, :version) @@ -166,7 +166,7 @@ class ChangesetsController < ApplicationController end def load_ways - @ways_count = @changeset.old_ways.count + @ways_count = @changeset.actual_num_changed_ways @current_way_page = params[:way_page].to_i.clamp(1, element_pages_count(@ways_count)) @ways = @changeset.old_ways .order(:way_id, :version) @@ -175,7 +175,7 @@ class ChangesetsController < ApplicationController end def load_relations - @relations_count = @changeset.old_relations.count + @relations_count = @changeset.actual_num_changed_relations @current_relation_page = params[:relation_page].to_i.clamp(1, element_pages_count(@relations_count)) @relations = @changeset.old_relations .order(:relation_id, :version) diff --git a/test/system/changeset_elements_test.rb b/test/system/changeset_elements_test.rb index c1b946344..e8f23af13 100644 --- a/test/system/changeset_elements_test.rb +++ b/test/system/changeset_elements_test.rb @@ -3,7 +3,7 @@ require "application_system_test_case" class ChangesetElementsTest < ApplicationSystemTestCase test "can navigate between element subpages without losing comment input" do element_page_size = 20 - changeset = create(:changeset, :closed) + changeset = create(:changeset, :closed, :num_changes => 2 * (element_page_size + 1)) ways = create_list(:way, element_page_size + 1, :with_history, :changeset => changeset) way_paths = ways.map { |way| way_path(way) } nodes = create_list(:node, element_page_size + 1, :with_history, :changeset => changeset) -- 2.39.5