X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c1b5ae0aa08be555588de8098b5ea8319f4c7925..e89a78fff858d5db07f6959a39dd9655dc46008e:/app/controllers/changesets_controller.rb

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index 613a3ee2a..928f1c1ec 100644
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -4,7 +4,6 @@ class ChangesetsController < ApplicationController
   include UserMethods
 
   layout "site"
-  require "xml/libxml"
 
   before_action :authorize_web
   before_action :set_locale
@@ -16,12 +15,11 @@ class ChangesetsController < ApplicationController
 
   around_action :web_timeout
 
-  # Helper methods for checking consistency
-  include ConsistencyValidations
-
   ##
   # list non-empty changesets in reverse chronological order
   def index
+    param! :max_id, Integer, :min => 1
+
     @params = params.permit(:display_name, :bbox, :friends, :nearby, :max_id, :list)
 
     if request.format == :atom && @params[:max_id]
@@ -62,7 +60,7 @@ class ChangesetsController < ApplicationController
         changesets = changesets.where(:user => current_user.nearby)
       end
 
-      changesets = changesets.where("changesets.id <= ?", @params[:max_id]) if @params[:max_id]
+      changesets = changesets.where(:changesets => { :id => ..@params[:max_id] }) if @params[:max_id]
 
       @changesets = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)
 
@@ -79,19 +77,32 @@ class ChangesetsController < ApplicationController
   def show
     @type = "changeset"
     @changeset = Changeset.find(params[:id])
-    @comments = if current_user&.moderator?
-                  @changeset.comments.unscope(:where => :visible).includes(:author)
-                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")
-    if @changeset.user.active? && @changeset.user.data_public?
-      @next_by_user = @changeset.user.changesets.where("id > ?", @changeset.id).reorder(:id => :asc).first
-      @prev_by_user = @changeset.user.changesets.where("id < ?", @changeset.id).reorder(:id => :desc).first
+    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")
+      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")
+      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")
+      render :partial => "elements", :locals => { :type => "relation", :elements => @relations, :pages => @relation_pages }
+    else
+      @comments = if current_user&.moderator?
+                    @changeset.comments.unscope(:where => :visible).includes(:author)
+                  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")
+      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
+        @prev_by_user = changesets.where(:id => ...@changeset.id).reorder(:id => :desc).first
+      end
+      render :layout => map_layout
     end
-    render :layout => map_layout
   rescue ActiveRecord::RecordNotFound
     render :template => "browse/not_found", :status => :not_found, :layout => map_layout
   end