Merge branch 'master' into next

[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 8eca507ef91b96c12aee0198debec05d24861f8c..1daab997ae2c4f72899e9d9276df89880d1af423 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,21 +1,11 @@
-class OldWayController < ApplicationController
-  def history
-    response.headers["Content-Type"] = 'application/xml'
-    way = Way.find(params[:id])
+class OldWayController < OldController
+  private
 
-    unless way
-      render :nothing => true, :staus => 404
-      return
-    end
-    
-    doc = get_xml_doc
-
-    way.old_ways.each do |old_way|
-      doc.root << old_way.to_xml_node
-    end
-
-    render :text => doc.to_s
+  def lookup_old_element
+    @old_element = OldWay.find([params[:id], params[:version]])
   end
 
-
+  def lookup_old_element_versions
+    @elements = OldWay.where(:way_id => params[:id]).order(:version)
+  end
 end