X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cc90867183367d7758a11da3f2058117c7529891..898beb7b7f693cc21b329dab9a22268e3df77446:/app/controllers/changeset_controller.rb diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index 3e1870b70..8f882e80e 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -4,8 +4,7 @@ class ChangesetController < ApplicationController layout 'site' require 'xml/libxml' -# session :off -# FIXME is this required? + session :off, :except => [:list] before_filter :authorize_web, :only => [:list] before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close] before_filter :check_write_availability, :only => [:create, :update, :delete, :upload, :include] @@ -377,11 +376,11 @@ private times = time.split(/,/) raise OSM::APIBadUserInput.new("bad time range") if times.size != 2 - from, to = times.collect { |t| DateTime.parse(t) } + from, to = times.collect { |t| Time.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 >= ?', DateTime.parse(time)] + return ['closed_at >= ?', Time.parse(time)] end else return nil @@ -397,7 +396,7 @@ private ## # restrict changes to those which are open def conditions_open(open) - return open.nil? ? nil : ['closed_at >= ?', DateTime.now] + return open.nil? ? nil : ['closed_at >= ?', Time.now] end end