Fix to_xml method of old_relation model.

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 03d5aebfff3006eaa91036b5efa26118835b7223..10c76a758cc4561dfbf2babb89bc0f9f4358dd21 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,12 +1,12 @@
 class OldRelation < ActiveRecord::Base
   set_table_name 'relations'
 
-  belongs_to :user
+  belongs_to :changeset
 
   def self.from_relation(relation)
     old_relation = OldRelation.new
     old_relation.visible = relation.visible
-    old_relation.user_id = relation.user_id
+    old_relation.changeset_id = relation.changeset_id
     old_relation.timestamp = relation.timestamp
     old_relation.id = relation.id
     old_relation.version = relation.version
@@ -91,8 +91,9 @@ class OldRelation < 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?
+    el1['user'] = self.changeset.user.display_name if self.changeset.user.data_public?
     el1['version'] = self.version.to_s
+    el1['changeset'] = self.changeset_id.to_s
     
     self.old_members.each do |member|
       e = XML::Node.new 'member'
@@ -109,5 +110,20 @@ class OldRelation < ActiveRecord::Base
       el1 << e
     end
     return el1
-  end 
+  end
+
+  # Temporary method to match interface to nodes
+  def tags_as_hash
+    return self.tags
+  end
+
+  # Temporary method to match interface to relations
+  def relation_members
+    return self.old_members
+  end
+
+  # Pretend we're not in any relations
+  def containing_relation_members
+    return []
+  end
 end