Remove unused (and non-functioning) code

diff --git a/app/models/node.rb b/app/models/node.rb
index 12ffa20917c840c7eb172687a31265419a90cfde..09f494b7cc54df554584e740d366d4287eb1ad3c 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -21,7 +21,7 @@ class Node < ActiveRecord::Base
   has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
   has_many :ways_via_history, :class_name=> "Way", :through => :old_way_nodes, :source => :way
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member

-  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation

 
   validates_presence_of :id, :on => :update
   validates_presence_of :timestamp,:version,  :changeset_id
 
   validates_presence_of :id, :on => :update
   validates_presence_of :timestamp,:version,  :changeset_id

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 4e423504939d294eda3a3a04a82276b81e34f72d..008f365c4a248d72b307c96d2725536a14c952d3 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -15,7 +15,7 @@ class Relation < ActiveRecord::Base
   has_many :relation_tags
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
   has_many :relation_tags
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member

-  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation

 
   validates_presence_of :id, :on => :update
   validates_presence_of :timestamp,:version,  :changeset_id 
 
   validates_presence_of :id, :on => :update
   validates_presence_of :timestamp,:version,  :changeset_id 

diff --git a/app/models/way.rb b/app/models/way.rb
index a9fdd88eeb1ca7f46714d42c3ec7cf8e61fe1344..1da048c96b00b39c3c2bd91028949bb531c9efa2 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -17,7 +17,7 @@ class Way < ActiveRecord::Base
   has_many :way_tags
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member
   has_many :way_tags
 
   has_many :containing_relation_members, :class_name => "RelationMember", :as => :member

-  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation, :extend => ObjectFinder
+  has_many :containing_relations, :class_name => "Relation", :through => :containing_relation_members, :source => :relation

 
   validates_presence_of :id, :on => :update
   validates_presence_of :changeset_id,:version,  :timestamp
 
   validates_presence_of :id, :on => :update
   validates_presence_of :changeset_id,:version,  :timestamp

diff --git a/lib/object_finder.rb b/lib/object_finder.rb
deleted file mode 100644 (file)
index 26608a7..0000000
--- a/lib/object_finder.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module ObjectFinder
-  def visible
-    find :all, :conditions => "#{proxy_reflection.table_name}.visible = 1"
-  end
-end