Merge branch 'master' into openid

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index e2a6505112fadd9b639c899cd3b5d295133e13d4..ca43b59127c923b6dde9d0e6cebcb2ae9136807b 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -25,7 +25,7 @@ class OldRelation < ActiveRecord::Base
     save!
     clear_aggregation_cache
     clear_association_cache
     save!
     clear_aggregation_cache
     clear_association_cache

-    @attributes.update(OldRelation.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp]).instance_variable_get('@attributes'))
+    @attributes.update(OldRelation.find(:first, :conditions => ['id = ? AND timestamp = ?', self.id, self.timestamp], :order => "version desc").instance_variable_get('@attributes'))

 
     # ok, you can touch from here on
 
 
     # ok, you can touch from here on
 


@@ -41,7 +41,7 @@ class OldRelation < ActiveRecord::Base
     self.members.each_with_index do |m,i|
       member = OldRelationMember.new
       member.id = [self.id, self.version, i]
     self.members.each_with_index do |m,i|
       member = OldRelationMember.new
       member.id = [self.id, self.version, i]

-      member.member_type = m[0]
+      member.member_type = m[0].classify

       member.member_id = m[1]
       member.member_role = m[2]
       member.save!
       member.member_id = m[1]
       member.member_role = m[2]
       member.save!


@@ -81,7 +81,7 @@ class OldRelation < ActiveRecord::Base
 #  has_many :relation_tags, :class_name => 'OldRelationTag', :foreign_key => 'id'
 
   def old_members
 #  has_many :relation_tags, :class_name => 'OldRelationTag', :foreign_key => 'id'
 
   def old_members

-    OldRelationMember.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version])    
+    OldRelationMember.find(:all, :conditions => ['id = ? AND version = ?', self.id, self.version], :order => "sequence_id")

   end
 
   def old_tags
   end
 
   def old_tags


@@ -108,7 +108,7 @@ class OldRelation < ActiveRecord::Base
     
     self.old_members.each do |member|
       e = XML::Node.new 'member'
     
     self.old_members.each do |member|
       e = XML::Node.new 'member'

-      e['type'] = member.member_type.to_s
+      e['type'] = member.member_type.to_s.downcase

       e['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
       e['role'] = member.member_role.to_s
       el1 << e
       e['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
       e['role'] = member.member_role.to_s
       el1 << e