Update bundle

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 8e0727743dd88ffa48b9d7c506bec0e1f35ec3b6..0e85122a48b67bba0954e047a95065f7fdb7dceb 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -13,10 +13,12 @@ class OldRelation < ActiveRecord::Base
   belongs_to :redaction
   belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
 
   belongs_to :redaction
   belongs_to :current_relation, :class_name => "Relation", :foreign_key => "relation_id"
 

-  has_many :old_members, -> { order(:sequence_id) }, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version]
-  has_many :old_tags, :class_name => 'OldRelationTag', :foreign_key => [:relation_id, :version]
+  has_many :old_members, -> { order(:sequence_id) }, :class_name => "OldRelationMember", :foreign_key => [:relation_id, :version]
+  has_many :old_tags, :class_name => "OldRelationTag", :foreign_key => [:relation_id, :version]

 
 

-  validates_associated :changeset
+  validates :changeset, :presence => true, :associated => true
+  validates :timestamp, :presence => true
+  validates :visible, :inclusion => [true, false]

 
   def self.from_relation(relation)
     old_relation = OldRelation.new
 
   def self.from_relation(relation)
     old_relation = OldRelation.new


@@ -73,16 +75,16 @@ class OldRelation < ActiveRecord::Base
   end
 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})
   end
 
   def to_xml_node(changeset_cache = {}, user_display_name_cache = {})

-    el = XML::Node.new 'relation'
-    el['id'] = relation_id.to_s
+    el = XML::Node.new "relation"
+    el["id"] = relation_id.to_s

 
     add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
 
     old_members.each do |member|
 
     add_metadata_to_xml_node(el, self, changeset_cache, user_display_name_cache)
 
     old_members.each do |member|

-      member_el = XML::Node.new 'member'
-      member_el['type'] = member.member_type.to_s.downcase
-      member_el['ref'] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
-      member_el['role'] = member.member_role.to_s
+      member_el = XML::Node.new "member"
+      member_el["type"] = member.member_type.to_s.downcase
+      member_el["ref"] = member.member_id.to_s # "id" is considered uncool here as it should be unique in XML
+      member_el["role"] = member.member_role.to_s

       el << member_el
     end
 
       el << member_el
     end
 


@@ -91,11 +93,6 @@ class OldRelation < ActiveRecord::Base
     el
   end
 
     el
   end
 

-  # Temporary method to match interface to nodes
-  def tags_as_hash
-    tags
-  end
-

   # Temporary method to match interface to relations
   def relation_members
     old_members
   # Temporary method to match interface to relations
   def relation_members
     old_members