Merge pull request #4498 from tomhughes/remove-help-link

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

diff --git a/app/controllers/changesets_controller.rb b/app/controllers/changesets_controller.rb
index 32d9fd73314f53e731717081af5c383550298f8b..859242b60fff5106ec2361b724f2972c5d423ab1 100644 (file)
--- a/app/controllers/changesets_controller.rb
+++ b/app/controllers/changesets_controller.rb
@@ -1,13 +1,14 @@
 # The ChangesetController is the RESTful interface to Changeset objects
 
 class ChangesetsController < ApplicationController
 # The ChangesetController is the RESTful interface to Changeset objects
 
 class ChangesetsController < ApplicationController

+  include UserMethods
+

   layout "site"
   require "xml/libxml"
 
   layout "site"
   require "xml/libxml"
 

-  skip_before_action :verify_authenticity_token, :except => [:index]

   before_action :authorize_web
   before_action :set_locale
   before_action :authorize_web
   before_action :set_locale

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

 
   authorize_resource
 
 
   authorize_resource
 


@@ -47,21 +48,21 @@ class ChangesetsController < ApplicationController
 
       if @params[:display_name]
         changesets = if user.data_public? || user == current_user
 
       if @params[:display_name]
         changesets = if user.data_public? || user == current_user

-                       changesets.where(:user_id => user.id)
+                       changesets.where(:user => user)

                      else
                        changesets.where("false")
                      end
       elsif @params[:bbox]
         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
       elsif @params[:friends] && current_user
                      else
                        changesets.where("false")
                      end
       elsif @params[:bbox]
         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
       elsif @params[:friends] && current_user

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

       elsif @params[:nearby] && current_user
       elsif @params[:nearby] && current_user

-        changesets = changesets.where(:user_id => current_user.nearby)
+        changesets = changesets.where(:user => current_user.nearby)

       end
 
       changesets = changesets.where("changesets.id <= ?", @params[:max_id]) if @params[:max_id]
 
       end
 
       changesets = changesets.where("changesets.id <= ?", @params[:max_id]) if @params[:max_id]
 

-      @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)
+      @changesets = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)

 
       render :action => :index, :layout => false
     end
 
       render :action => :index, :layout => false
     end


@@ -82,7 +83,6 @@ class ChangesetsController < ApplicationController
   ##
   # if a bounding box was specified do some sanity checks.
   # restrict changesets to those enclosed by a bounding box
   ##
   # if a bounding box was specified do some sanity checks.
   # restrict changesets to those enclosed by a bounding box

-  # we need to return both the changesets and the bounding box

   def conditions_bbox(changesets, bbox)
     if bbox
       bbox.check_boundaries
   def conditions_bbox(changesets, bbox)
     if bbox
       bbox.check_boundaries