X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/40414cf324309d13d207f9339b7f40ce05a9fa2a..0be6dd860f1843681e6380fbe69ca71a6eb01ab7:/app/models/old_way.rb

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 2820d9438..ce856e208 100644
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,4 +1,6 @@
 class OldWay < ActiveRecord::Base
+  include ConsistencyValidations
+  
   set_table_name 'ways'
 
   belongs_to :changeset
@@ -6,7 +8,7 @@ class OldWay < ActiveRecord::Base
   def self.from_way(way)
     old_way = OldWay.new
     old_way.visible = way.visible
-    old_way.user_id = way.user_id
+    old_way.changeset_id = way.changeset_id
     old_way.timestamp = way.timestamp
     old_way.id = way.id
     old_way.version = way.version
@@ -94,8 +96,12 @@ class OldWay < ActiveRecord::Base
     el1['id'] = self.id.to_s
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
-    el1['user'] = self.user.display_name if self.user.data_public?
+    if self.changeset.user.data_public?
+      el1['user'] = self.changeset.user.display_name
+      el1['uid'] = self.changeset.user.id.to_s
+    end
     el1['version'] = self.version.to_s
+    el1['changeset'] = self.changeset.id.to_s
     
     self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
       e = XML::Node.new 'nd'