changing the belongs_to and has_many items in the models to reflect the new foriegn...

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index c9eeb0018371cf1b9107fabbf9c487c167f8a22b..04023ae2b94a6f883966b4aead228ac57508d439 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -4,6 +4,13 @@ class Changeset < ActiveRecord::Base
   belongs_to :user
 
   has_many :changeset_tags, :foreign_key => 'id'
+  
+  has_many :nodes
+  has_many :ways
+  has_many :relations
+  has_many :old_nodes
+  has_many :old_ways
+  has_many :old_relations
 
   def self.from_xml(xml, create=false)
     begin

diff --git a/app/models/node.rb b/app/models/node.rb
index 6770231790735b0ffc4e3f1957e5d4598de8e3df..2efdb1bc93b58ce7f73c38bf67425c5123bb462d 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -10,7 +10,7 @@ class Node < ActiveRecord::Base
   validates_numericality_of :latitude, :longitude
   validate :validate_position
 
-  belongs_to :user
+  belongs_to :changeset
 
   has_many :old_nodes, :foreign_key => :id
 

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index 6b6b71b53eaae06d0f7c591c919aaa51c81f3dd1..58a514bcd7b213b0081cbec3fab73eca91c0eb7d 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -8,7 +8,7 @@ class OldNode < ActiveRecord::Base
   validates_numericality_of :latitude, :longitude
   validate :validate_position
 
-  belongs_to :user
+  belongs_to :changeset
  
   def validate_position
     errors.add_to_base("Node is not in the world") unless in_world?

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index f5885f39ffb59adc799f4b5ea7832066f9654f5a..9dca97a27ae2aeab20dae1a8263583e280ee91d1 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,7 +1,7 @@
 class OldRelation < ActiveRecord::Base
   set_table_name 'relations'
 
-  belongs_to :user
+  belongs_to :changeset
 
   def self.from_relation(relation)
     old_relation = OldRelation.new

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 3c88c4673401fb20b3cb5dcedac4067ff56a1db5..2820d9438a1e6868151e68a01595c0bed7f1610a 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,7 +1,7 @@
 class OldWay < ActiveRecord::Base
   set_table_name 'ways'
 
-  belongs_to :user
+  belongs_to :changeset
 
   def self.from_way(way)
     old_way = OldWay.new

diff --git a/app/models/relation.rb b/app/models/relation.rb
index e46da5ade03f3356a18d09008f9d598f0eaaff5d..bb8f2d00342de67fedac105ae3d6136c478b6f25 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -3,7 +3,7 @@ class Relation < ActiveRecord::Base
   
   set_table_name 'current_relations'
 
-  belongs_to :user
+  belongs_to :changeset
 
   has_many :old_relations, :foreign_key => 'id', :order => 'version'
 

diff --git a/app/models/way.rb b/app/models/way.rb
index 3bc8bcebec9f7b99b7c318d594a18d2307556260..8da9598537681773d41bb6b4966fed0ce3b892c2 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -3,7 +3,7 @@ class Way < ActiveRecord::Base
 
   set_table_name 'current_ways'
 
-  belongs_to :user
+  belongs_to :changeset
 
   has_many :old_ways, :foreign_key => 'id', :order => 'version'