Avoid use of deprecated methods on error objects

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 29b9c787bc447706ef04a26fe4501b58ac947bee..b580ea7866ec5bbd5810c60c9cf46b8d21e5f161 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -16,8 +16,6 @@ class ChangesetController < ApplicationController
   around_filter :api_call_handle_error, :except => [:list]
   around_filter :web_timeout, :only => [:list]
 
   around_filter :api_call_handle_error, :except => [:list]
   around_filter :web_timeout, :only => [:list]
 

-  filter_parameter_logging "<osmChange version"
-

   # Help methods for checking boundary sanity and area size
   include MapBoundary
 
   # Help methods for checking boundary sanity and area size
   include MapBoundary
 


@@ -179,9 +177,7 @@ class ChangesetController < ApplicationController
           created << elt.to_xml_node
         else
           # get the previous version from the element history
           created << elt.to_xml_node
         else
           # get the previous version from the element history

-          prev_elt = elt.class.find(:first, :conditions => 
-                                    ['id = ? and version = ?',
-                                     elt.id, elt.version])
+          prev_elt = elt.class.where(:id => elt.id, :version => elt.version).first

           unless elt.visible
             # if the element isn't visible then it must have been deleted, so
             # output the *previous* XML
           unless elt.visible
             # if the element isn't visible then it must have been deleted, so
             # output the *previous* XML


@@ -312,6 +308,8 @@ class ChangesetController < ApplicationController
       @page = (params[:page] || 1).to_i
       @page_size = 20
 
       @page = (params[:page] || 1).to_i
       @page_size = 20
 

+      @bbox = bbox
+      

       @edits = Changeset.find(:all,
                               :include => [:user, :changeset_tags],
                               :conditions => conditions,
       @edits = Changeset.find(:all,
                               :include => [:user, :changeset_tags],
                               :conditions => conditions,


@@ -436,7 +434,7 @@ private
   # query changesets which are closed
   # ('closed at' time has passed or changes limit is hit)
   def conditions_closed(closed)
   # query changesets which are closed
   # ('closed at' time has passed or changes limit is hit)
   def conditions_closed(closed)

-    return closed.nil? ? nil : ['closed_at < ? or num_changes > ?', 
+    return closed.nil? ? nil : ['(closed_at < ? or num_changes > ?)', 

                                 Time.now.getutc, Changeset::MAX_ELEMENTS]
   end
 
                                 Time.now.getutc, Changeset::MAX_ELEMENTS]
   end
 


@@ -444,7 +442,7 @@ private
   # eliminate empty changesets (where the bbox has not been set)
   # this should be applied to all changeset list displays
   def conditions_nonempty()
   # eliminate empty changesets (where the bbox has not been set)
   # this should be applied to all changeset list displays
   def conditions_nonempty()

-    return ['min_lat IS NOT NULL']
+    return ['num_changes > 0']

   end
   
 end
   end
   
 end