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

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

diff --git a/app/controllers/old_way_controller.rb b/app/controllers/old_way_controller.rb
index dae0957b30b0cceb868b475b0d57a48be7f6f727..1daab997ae2c4f72899e9d9276df89880d1af423 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,13 +1,11 @@
 class OldWayController < OldController
 class OldWayController < OldController

-

   private
   private

-  
+

   def lookup_old_element
     @old_element = OldWay.find([params[:id], params[:version]])
   end
 
   def lookup_old_element
     @old_element = OldWay.find([params[:id], params[:version]])
   end
 

-  def lookup_old_elements_via_current
-    way = Way.find(params[:id])
-    @elements = way.old_ways
+  def lookup_old_element_versions
+    @elements = OldWay.where(:way_id => params[:id]).order(:version)

   end
 end
   end
 end