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

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index e701f21702cf25a4596c8bf3216ece223d0936bb..1ee5e9cee2b14beacc1552c409694583dd1075c4 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -490,8 +490,8 @@ class AmfController < ApplicationController
       new_relation.changeset_id = changeset_id
       new_relation.version = version
 
       new_relation.changeset_id = changeset_id
       new_relation.version = version
 

-
-      if id <= 0
+      # NOTE: id or relid here? id doesn't seem to be set above
+      if relid <= 0

         # We're creating the node
         new_relation.create_with_history(user)
       elsif visible
         # We're creating the node
         new_relation.create_with_history(user)
       elsif visible

diff --git a/app/models/node.rb b/app/models/node.rb
index 679048b4e3aa18dc453cde9776410b3b7ba0cb2b..f6726f91a05c730506979e93153c0f1cfca1a2c0 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -171,7 +171,6 @@ class Node < ActiveRecord::Base
   
   def create_with_history(user)
     check_create_consistency(self, user)
   
   def create_with_history(user)
     check_create_consistency(self, user)

-    self.id = nil

     self.version = 0
     self.visible = true
 
     self.version = 0
     self.visible = true