Tidy up some insanity in the creating of new notes

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 29b9c787bc447706ef04a26fe4501b58ac947bee..45b5f80f9479c7fe8c300d363f77215083e344d8 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -312,6 +312,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 +438,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 +446,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