undo composite keys change on old_ndoe

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 6da7814c28a40d442e856239e09149b2ca8727c5..03d5aebfff3006eaa91036b5efa26118835b7223 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -9,6 +9,7 @@ class OldRelation < ActiveRecord::Base
     old_relation.user_id = relation.user_id
     old_relation.timestamp = relation.timestamp
     old_relation.id = relation.id
     old_relation.user_id = relation.user_id
     old_relation.timestamp = relation.timestamp
     old_relation.id = relation.id

+    old_relation.version = relation.version

     old_relation.members = relation.members
     old_relation.tags = relation.tags
     return old_relation
     old_relation.members = relation.members
     old_relation.tags = relation.tags
     return old_relation


@@ -91,6 +92,7 @@ class OldRelation < ActiveRecord::Base
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['user'] = self.user.display_name if self.user.data_public?
     el1['visible'] = self.visible.to_s
     el1['timestamp'] = self.timestamp.xmlschema
     el1['user'] = self.user.display_name if self.user.data_public?

+    el1['version'] = self.version.to_s

     
     self.old_members.each do |member|
       e = XML::Node.new 'member'
     
     self.old_members.each do |member|
       e = XML::Node.new 'member'