cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DateTime => Time for consistency in changeset code, ok by shaun.

Browse source
This commit is contained in:
Thomas Wood 2008-12-31 16:33:02 +00:00
parent 8fe53e4823
commit 898beb7b7f
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/browse_controller.rb
View file

@ -8,7 +8,7 @@ class BrowseController < ApplicationController
end end
def index def index
@changesets = Changeset.find(:all, :order => "closed_at DESC", :conditions => ['closed_at < ?', DateTime.now], :limit=> 20) @changesets = Changeset.find(:all, :order => "closed_at DESC", :conditions => ['closed_at < ?', Time.now], :limit=> 20)
end end
def relation def relation

6
app/controllers/changeset_controller.rb
View file

@ -376,11 +376,11 @@ private
times = time.split(/,/) times = time.split(/,/)
raise OSM::APIBadUserInput.new("bad time range") if times.size != 2 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] return ['closed_at >= ? and created_at <= ?', from, to]
else else
# if there is no comma, assume its a lower limit on time # 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 end
else else
return nil return nil
@ -396,7 +396,7 @@ private
## ##
# restrict changes to those which are open # restrict changes to those which are open
def conditions_open(open) def conditions_open(open)
return open.nil? ? nil : ['closed_at >= ?', DateTime.now] return open.nil? ? nil : ['closed_at >= ?', Time.now]
end end
end end

2
app/views/changeset/_changeset.rhtml
View file

@ -5,7 +5,7 @@
#<%= changeset.id %> #<%= changeset.id %>
<td class="<%= cl %>"> <td class="<%= cl %>">
<% if changeset.closed_at > DateTime.now %> (still editing) <% if changeset.closed_at > Time.now %> (still editing)
<% else %><%= changeset.closed_at.strftime("%d %b %Y %H:%M") %><% end %> <% else %><%= changeset.closed_at.strftime("%d %b %Y %H:%M") %><% end %>
<td class="<%= cl %>"> <td class="<%= cl %>">

6
test/fixtures/changesets.yml vendored
View file

@ -7,7 +7,7 @@ normal_user_first_change:
id: 1 id: 1
user_id: 1 user_id: 1
created_at: "2007-01-01 00:00:00" created_at: "2007-01-01 00:00:00"
closed_at: <%= DateTime.now + Rational(1,24) %> closed_at: <%= Time.now + 1.hour %>
min_lon: <%= 1 * SCALE %> min_lon: <%= 1 * SCALE %>
min_lat: <%= 1 * SCALE %> min_lat: <%= 1 * SCALE %>
max_lon: <%= 5 * SCALE %> max_lon: <%= 5 * SCALE %>
@ -18,7 +18,7 @@ second_user_first_change:
id: 2 id: 2
user_id: 2 user_id: 2
created_at: "2008-05-01 01:23:45" created_at: "2008-05-01 01:23:45"
closed_at: <%= DateTime.now + Rational(1,24) %> closed_at: <%= Time.now + 1.hour %>
num_changes: 0 num_changes: 0
normal_user_closed_change: normal_user_closed_change:
@ -32,7 +32,7 @@ normal_user_version_change:
id: 4 id: 4
user_id: 1 user_id: 1
created_at: "2008-01-01 00:00:00" created_at: "2008-01-01 00:00:00"
closed_at: <%= DateTime.now + Rational(1,24) %> closed_at: <%= Time.now + 1.hour %>
min_lon: <%= 1 * SCALE %> min_lon: <%= 1 * SCALE %>
min_lat: <%= 1 * SCALE %> min_lat: <%= 1 * SCALE %>
max_lon: <%= 4 * SCALE %> max_lon: <%= 4 * SCALE %>

2
test/functional/browse_controller_test.rb
View file

@ -20,7 +20,7 @@ class BrowseControllerTest < ActionController::TestCase
# This should display the last 20 changesets closed. # This should display the last 20 changesets closed.
def test_index def test_index
@changesets = Changeset.find(:all, :order => "closed_at DESC", :conditions => ['closed_at < ?', DateTime.now], :limit=> 20) @changesets = Changeset.find(:all, :order => "closed_at DESC", :conditions => ['closed_at < ?', Time.now], :limit=> 20)
assert @changesets.size <= 20 assert @changesets.size <= 20
get :index get :index
assert_response :success assert_response :success