Merge branch 'pull/4990'

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

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index 2c50ff905868951487e9864daee1f554d459c3a0..d5ac49d4ccc04dafa68534158470872c3132f3b9 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -7,9 +7,8 @@ class ChangesetsController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale

-  before_action -> { check_database_readable(:need_api => true) }, :only => [:index, :feed, :show]
+  before_action -> { check_database_readable(:need_api => true) }

   before_action :require_oauth, :only => :show
   before_action :require_oauth, :only => :show

-  before_action :check_database_writable, :only => [:subscribe, :unsubscribe]

 
   authorize_resource
 
 
   authorize_resource
 


@@ -55,7 +54,7 @@ class ChangesetsController < ApplicationController
       elsif @params[:bbox]
         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
       elsif @params[:friends] && current_user
       elsif @params[:bbox]
         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
       elsif @params[:friends] && current_user

-        changesets = changesets.where(:user => current_user.friends.identifiable)
+        changesets = changesets.where(:user => current_user.followings.identifiable)

       elsif @params[:nearby] && current_user
         changesets = changesets.where(:user => current_user.nearby)
       end
       elsif @params[:nearby] && current_user
         changesets = changesets.where(:user => current_user.nearby)
       end


@@ -79,13 +78,13 @@ class ChangesetsController < ApplicationController
     @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?


@@ -93,9 +92,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


@@ -107,34 +106,6 @@ class ChangesetsController < ApplicationController
     render :template => "browse/not_found", :status => :not_found, :layout => map_layout
   end
 
     render :template => "browse/not_found", :status => :not_found, :layout => map_layout
   end
 

-  ##
-  # subscribe to a changeset
-  def subscribe
-    @changeset = Changeset.find(params[:id])
-
-    if request.post?
-      @changeset.subscribe(current_user) unless @changeset.subscribed?(current_user)
-
-      redirect_to changeset_path(@changeset)
-    end
-  rescue ActiveRecord::RecordNotFound
-    render :action => "no_such_entry", :status => :not_found
-  end
-
-  ##
-  # unsubscribe from a changeset
-  def unsubscribe
-    @changeset = Changeset.find(params[:id])
-
-    if request.post?
-      @changeset.unsubscribe(current_user)
-
-      redirect_to changeset_path(@changeset)
-    end
-  rescue ActiveRecord::RecordNotFound
-    render :action => "no_such_entry", :status => :not_found
-  end
-

   private
 
   #------------------------------------------------------------
   private
 
   #------------------------------------------------------------