Return after rendering - stops further processing in controller

[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 fc7366bb6657e3745c279f8cd6c5c4cd19d5d462..1daab997ae2c4f72899e9d9276df89880d1af423 100644 (file)
--- a/app/controllers/old_way_controller.rb
+++ b/app/controllers/old_way_controller.rb
@@ -1,58 +1,11 @@
-class OldWayController < ApplicationController
-  require 'xml/libxml'
+class OldWayController < OldController
+  private
 
-  skip_before_filter :verify_authenticity_token
-  before_filter :authorize, :only => [ :redact ]
-  before_filter :require_allow_write_api, :only => [ :redact ]
-  before_filter :check_api_readable
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
-
-  def history
-    way = Way.find(params[:id])
-
-    # TODO - maybe a bit heavyweight to do this on every
-    # call, perhaps try lazy auth.
-    setup_user_auth
-    
-    doc = OSM::API.new.get_xml_doc
-    
-    way.old_ways.each do |old_way|
-      unless old_way.redacted? and (@user.nil? or not @user.moderator?) and not params[:show_redactions] == "true"
-        doc.root << old_way.to_xml_node
-      end
-    end
-    
-    render :text => doc.to_s, :content_type => "text/xml"
+  def lookup_old_element
+    @old_element = OldWay.find([params[:id], params[:version]])
   end
-  
-  def version
-    if old_way = OldWay.where(:way_id => params[:id], :version => params[:version]).first
-      # TODO - maybe a bit heavyweight to do this on every
-      # call, perhaps try lazy auth.
-      setup_user_auth
-
-      if old_way.redacted? and (@user.nil? or not @user.moderator?) and not params[:show_redactions] == "true"
-        render :nothing => true, :status => :forbidden
-      else
-        response.last_modified = old_way.timestamp
-        
-        doc = OSM::API.new.get_xml_doc
-        doc.root << old_way.to_xml_node
-        
-        render :text => doc.to_s, :content_type => "text/xml"
-      end
-    else
-      render :nothing => true, :status => :not_found
-    end
-  end
-
-  def redact
-    if @user && @user.moderator?
-      render :nothing => true
 
-    else
-      render :nothing => true, :status => :forbidden
-    end
+  def lookup_old_element_versions
+    @elements = OldWay.where(:way_id => params[:id]).order(:version)
   end
 end