From 8c9e4ca1a979c6fd23f43c5602d478fd73dc25fc Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Fri, 8 Aug 2025 20:18:10 +0300 Subject: [PATCH] Add load elements methods for changeset controller --- app/controllers/changesets_controller.rb | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb index e7e0c244a..e1a0bc510 100644 --- a/app/controllers/changesets_controller.rb +++ b/app/controllers/changesets_controller.rb @@ -81,13 +81,13 @@ class ChangesetsController < ApplicationController @changeset = Changeset.find(params[:id]) case turbo_frame_request_id when "changeset_nodes" - @node_pages, @nodes = paginate(:old_nodes, :conditions => { :changeset_id => @changeset.id }, :order => [:node_id, :version], :per_page => 20, :parameter => "node_page") + load_nodes render :partial => "elements", :locals => { :type => "node", :elements => @nodes, :pages => @node_pages } when "changeset_ways" - @way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :order => [:way_id, :version], :per_page => 20, :parameter => "way_page") + load_ways render :partial => "elements", :locals => { :type => "way", :elements => @ways, :pages => @way_pages } when "changeset_relations" - @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :order => [:relation_id, :version], :per_page => 20, :parameter => "relation_page") + load_relations render :partial => "elements", :locals => { :type => "relation", :elements => @relations, :pages => @relation_pages } else @comments = if current_user&.moderator? @@ -95,9 +95,9 @@ class ChangesetsController < ApplicationController else @changeset.comments.includes(:author) end - @node_pages, @nodes = paginate(:old_nodes, :conditions => { :changeset_id => @changeset.id }, :order => [:node_id, :version], :per_page => 20, :parameter => "node_page") - @way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :order => [:way_id, :version], :per_page => 20, :parameter => "way_page") - @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :order => [:relation_id, :version], :per_page => 20, :parameter => "relation_page") + load_nodes + load_ways + load_relations if @changeset.user.active? && @changeset.user.data_public? changesets = conditions_nonempty(@changeset.user.changesets) @next_by_user = changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first @@ -153,4 +153,16 @@ class ChangesetsController < ApplicationController def conditions_nonempty(changesets) changesets.where("num_changes > 0") end + + def load_nodes + @node_pages, @nodes = paginate(:old_nodes, :conditions => { :changeset_id => @changeset.id }, :order => [:node_id, :version], :per_page => 20, :parameter => "node_page") + end + + def load_ways + @way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :order => [:way_id, :version], :per_page => 20, :parameter => "way_page") + end + + def load_relations + @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :order => [:relation_id, :version], :per_page => 20, :parameter => "relation_page") + end end -- 2.39.5