lose the unneeded <% syntax %>

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 8f882e80e1849d81f868f29dae7c893987b5fa7a..b2ff42711db55a59f35056993647417494252be5 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -376,11 +376,11 @@ private
         times = time.split(/,/)
         raise OSM::APIBadUserInput.new("bad time range") if times.size != 2 
 
         times = time.split(/,/)
         raise OSM::APIBadUserInput.new("bad time range") if times.size != 2 
 

-        from, to = times.collect { |t| Time.parse(t) }
+        from, to = times.collect { |t| DateTime.parse(t) }

         return ['closed_at >= ? and created_at <= ?', from, to]
       else
         # if there is no comma, assume its a lower limit on time
         return ['closed_at >= ? and created_at <= ?', from, to]
       else
         # if there is no comma, assume its a lower limit on time

-        return ['closed_at >= ?', Time.parse(time)]
+        return ['closed_at >= ?', DateTime.parse(time)]

       end
     else
       return nil
       end
     else
       return nil


@@ -395,8 +395,14 @@ private
 
   ##
   # restrict changes to those which are open
 
   ##
   # restrict changes to those which are open

+  #
+  # at the moment this code assumes we're only interested in open
+  # changesets and gives no facility to query closed changesets. this
+  # would be reasonably simple to implement if anyone actually wants
+  # it?

   def conditions_open(open)
   def conditions_open(open)

-    return open.nil? ? nil : ['closed_at >= ?', Time.now]
+    return open.nil? ? nil : ['closed_at >= ? and num_changes <= ?', 
+                              DateTime.now, Changeset::MAX_ELEMENTS]

   end
 
 end
   end
 
 end