X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0be6dd860f1843681e6380fbe69ca71a6eb01ab7..e79fd0763854f8cf41aefd7364c6bdf476280811:/app/models/old_relation.rb

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 491b444a6..ffddc7945 100644
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -36,14 +36,12 @@ class OldRelation < ActiveRecord::Base
       tag.save!
     end
 
-    i = 1
-    self.members.each do |m|
+    self.members.each_with_index do |m,i|
       member = OldRelationMember.new
-      member.id = self.id
+      member.id = [self.id, self.version, i]
       member.member_type = m[0]
       member.member_id = m[1]
       member.member_role = m[2]
-      member.version = self.version
       member.save!
     end
   end
@@ -51,7 +49,7 @@ class OldRelation < ActiveRecord::Base
   def members
     unless @members
         @members = Array.new
-        OldRelationMember.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version]).each do |m|
+        OldRelationMember.find(:all, :conditions => ["id = ? AND version = ?", self.id, self.version], :order => "sequence_id").each do |m|
             @members += [[m.type,m.id,m.role]]
         end
     end