Refactor to remove some code duplication.

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index cedfaf656250e25b01f148b8c8175f13153e035b..a1dc9f81d646195704f3dfc2a326997c39d63157 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -1,14 +1,17 @@
 class Relation < ActiveRecord::Base
   require 'xml/libxml'
   
 class Relation < ActiveRecord::Base
   require 'xml/libxml'
   

+  set_table_name 'current_relations'
+

   belongs_to :user
 
   belongs_to :user
 

+  has_many :old_relations, :foreign_key => 'id', :order => 'version'
+

   has_many :relation_members, :foreign_key => 'id'
   has_many :relation_tags, :foreign_key => 'id'
 
   has_many :relation_members, :foreign_key => 'id'
   has_many :relation_tags, :foreign_key => 'id'
 

-  has_many :old_relations, :foreign_key => 'id', :order => 'version'
-
-  set_table_name 'current_relations'
+  has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation

 
   def self.from_xml(xml, create=false)
     begin
 
   def self.from_xml(xml, create=false)
     begin


@@ -254,4 +257,8 @@ class Relation < ActiveRecord::Base
     return false
   end
 
     return false
   end
 

+  # Temporary method to match interface to nodes
+  def tags_as_hash
+    return self.tags
+  end

 end
 end