Merge remote-tracking branch 'upstream/pull/5284'

[rails.git] / app / controllers / changesets_controller.rb

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index ba04b9a1771a5fa5501f2b3359140c221952a67d..928f1c1ecf25724fa33fc9933eed9d49ded35bc4 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -75,16 +75,17 @@ class ChangesetsController < ApplicationController
   end
 
   def show
   end
 
   def show

+    @type = "changeset"

     @changeset = Changeset.find(params[:id])
     case turbo_frame_request_id
     when "changeset_nodes"
     @changeset = Changeset.find(params[:id])
     case turbo_frame_request_id
     when "changeset_nodes"

-      @node_pages, @nodes = paginate(:old_nodes, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "node_page")
+      @node_pages, @nodes = paginate(:old_nodes, :conditions => { :changeset_id => @changeset.id }, :order => [:node_id, :version], :per_page => 20, :parameter => "node_page")

       render :partial => "elements", :locals => { :type => "node", :elements => @nodes, :pages => @node_pages }
     when "changeset_ways"
       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 }, :per_page => 20, :parameter => "way_page")
+      @way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :order => [:way_id, :version], :per_page => 20, :parameter => "way_page")

       render :partial => "elements", :locals => { :type => "way", :elements => @ways, :pages => @way_pages }
     when "changeset_relations"
       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 }, :per_page => 20, :parameter => "relation_page")
+      @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :order => [:relation_id, :version], :per_page => 20, :parameter => "relation_page")

       render :partial => "elements", :locals => { :type => "relation", :elements => @relations, :pages => @relation_pages }
     else
       @comments = if current_user&.moderator?
       render :partial => "elements", :locals => { :type => "relation", :elements => @relations, :pages => @relation_pages }
     else
       @comments = if current_user&.moderator?


@@ -92,9 +93,9 @@ class ChangesetsController < ApplicationController
                   else
                     @changeset.comments.includes(:author)
                   end
                   else
                     @changeset.comments.includes(:author)
                   end

-      @node_pages, @nodes = paginate(:old_nodes, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "node_page")
-      @way_pages, @ways = paginate(:old_ways, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "way_page")
-      @relation_pages, @relations = paginate(:old_relations, :conditions => { :changeset_id => @changeset.id }, :per_page => 20, :parameter => "relation_page")
+      @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")

       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
       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