Add a user index to the changeset table.

[rails.git] / app / models / way.rb

diff --git a/app/models/way.rb b/app/models/way.rb
index 94a6fa7548faf23299219d5e7f9d5aed72e82847..e134d697d63a2b14a5cd61a3c29624c8b00b7714 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -51,7 +51,7 @@ class Way < ActiveRecord::Base
 
     # This next section isn't required for the create, update, or delete of ways
     if create
-      way.timestamp = Time.now
+      way.timestamp = Time.now.getutc
       way.visible = true
     else
       if pt['timestamp']
@@ -246,7 +246,7 @@ class Way < ActiveRecord::Base
     Way.transaction do
       check_consistency(self, new_way, user)
       if RelationMember.find(:first, :joins => "INNER JOIN current_relations ON current_relations.id=current_relation_members.id",
-                             :conditions => [ "visible = ? AND member_type='way' and member_id=? ", true, self.id])
+                             :conditions => [ "visible = ? AND member_type='Way' and member_id=? ", true, self.id])
         raise OSM::APIPreconditionFailedError.new("You need to make sure that this way is not a member of a relation.")
       else
         self.changeset_id = new_way.changeset_id
@@ -296,7 +296,7 @@ class Way < ActiveRecord::Base
   private
   
   def save_with_history!
-    t = Time.now
+    t = Time.now.getutc
 
     # update the bounding box, note that this has to be done both before 
     # and after the save, so that nodes from both versions are included in the