Merge pull request #14 from tomhughes/routing

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

diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb
index e137554d58c6f3f0978ee079904c8f459aa09bbd..a542a9bde4843fc2dccb6e9db36508166ce62c40 100644 (file)
--- a/app/controllers/old_controller.rb
+++ b/app/controllers/old_controller.rb
@@ -14,9 +14,14 @@ class OldController < ApplicationController
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
   before_filter :lookup_old_element, :except => [ :history ]
   after_filter :compress_output
   around_filter :api_call_handle_error, :api_call_timeout
   before_filter :lookup_old_element, :except => [ :history ]

-  before_filter :lookup_old_elements_via_current, :only => [ :history ]
+  before_filter :lookup_old_element_versions, :only => [ :history ]

 
   def history
 
   def history

+    # the .where() method used in the lookup_old_element_versions
+    # call won't throw an error if no records are found, so we have 
+    # to do that ourselves.
+    raise OSM::APINotFoundError.new if @elements.empty?
+

     doc = OSM::API.new.get_xml_doc
     
     visible_elements = if show_redactions?
     doc = OSM::API.new.get_xml_doc
     
     visible_elements = if show_redactions?


@@ -34,7 +39,7 @@ class OldController < ApplicationController
   
   def version
     if @old_element.redacted? and not show_redactions?
   
   def version
     if @old_element.redacted? and not show_redactions?

-      render :nothing => true, :status => :forbidden
+      render :text => "", :status => :forbidden

 
     else
       response.last_modified = @old_element.timestamp
 
     else
       response.last_modified = @old_element.timestamp


@@ -50,8 +55,7 @@ class OldController < ApplicationController
     redaction_id = params['redaction']
     unless redaction_id.nil?
       # if a redaction ID was specified, then set this element to
     redaction_id = params['redaction']
     unless redaction_id.nil?
       # if a redaction ID was specified, then set this element to

-      # be redacted in that redaction. (TODO: check that the
-      # user doing the redaction owns the redaction object too)
+      # be redacted in that redaction.

       redaction = Redaction.find(redaction_id.to_i)
       @old_element.redact!(redaction)
       
       redaction = Redaction.find(redaction_id.to_i)
       @old_element.redact!(redaction)
       


@@ -62,7 +66,7 @@ class OldController < ApplicationController
     end
     
     # just return an empty 200 OK for success
     end
     
     # just return an empty 200 OK for success

-    render :nothing => true
+    render :text => ""

   end
 
   private
   end
 
   private