Merge remote-tracking branch 'upstream/pull/2014'

[rails.git] / app / controllers / old_relation_controller.rb

diff --git a/app/controllers/old_relation_controller.rb b/app/controllers/old_relation_controller.rb
index ffb06bf5e9010bea85398ad983e992d51752f5e0..78eca324cb4cb819e0450f089b179de947b074f3 100644 (file)
--- a/app/controllers/old_relation_controller.rb
+++ b/app/controllers/old_relation_controller.rb
@@ -1,13 +1,11 @@
 class OldRelationController < OldController
-
   private
-  
+
   def lookup_old_element
     @old_element = OldRelation.find([params[:id], params[:version]])
   end
 
-  def lookup_old_elements_via_current
-    relation = Relation.find(params[:id])
-    @elements = relation.old_relations
+  def lookup_old_element_versions
+    @elements = OldRelation.where(:relation_id => params[:id]).order(:version)
   end
 end