Fixed a problem where rails was setting the ID column to null, which violates the...

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

diff --git a/app/models/node.rb b/app/models/node.rb
index d3e0a7e8d392a470ed193eb6de4fff0738ee8e29..f6726f91a05c730506979e93153c0f1cfca1a2c0 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -150,17 +150,20 @@ class Node < ActiveRecord::Base
   def update_from(new_node, user)
     check_consistency(self, new_node, user)
 
-    # update changeset with *old* position first
+    # update changeset first
+    self.changeset_id = new_node.changeset_id
+    self.changeset = new_node.changeset
+
+    # update changeset bbox with *old* position first
     changeset.update_bbox!(bbox);
 
     # FIXME logic needs to be double checked
-    self.changeset_id = new_node.changeset_id
     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude
     self.tags = new_node.tags
     self.visible = true
 
-    # update changeset with *new* position
+    # update changeset bbox with *new* position
     changeset.update_bbox!(bbox);
 
     save_with_history!
@@ -168,7 +171,6 @@ class Node < ActiveRecord::Base
   
   def create_with_history(user)
     check_create_consistency(self, user)
-    self.id = nil
     self.version = 0
     self.visible = true
 
@@ -264,7 +266,7 @@ class Node < ActiveRecord::Base
   private
 
   def save_with_history!
-    t = Time.now
+    t = Time.now.getutc
     Node.transaction do
       self.version += 1
       self.timestamp = t