Cleanup trailing whitespace

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

diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb
index e137554d58c6f3f0978ee079904c8f459aa09bbd..82669f504dca46eda5462cc3fc6c78c7c8704344 100644 (file)
--- a/app/controllers/old_controller.rb
+++ b/app/controllers/old_controller.rb
@@ -14,11 +14,16 @@ class OldController < ApplicationController
   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
+    # 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?
                          @elements
                        else
@@ -28,20 +33,20 @@ class OldController < ApplicationController
     visible_elements.each do |element|
       doc.root << element.to_xml_node
     end
-    
+
     render :text => doc.to_s, :content_type => "text/xml"
   end
-  
+
   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
-      
+
       doc = OSM::API.new.get_xml_doc
       doc.root << @old_element.to_xml_node
-        
+
       render :text => doc.to_s, :content_type => "text/xml"
     end
   end
@@ -50,23 +55,22 @@ class OldController < ApplicationController
     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)
-      
+
     else
       # if no redaction ID was provided, then this is an unredact
       # operation.
       @old_element.redact!(nil)
     end
-    
+
     # just return an empty 200 OK for success
-    render :nothing => true
+    render :text => ""
   end
 
   private
-  
+
   def show_redactions?
     @user and @user.moderator? and params[:show_redactions] == "true"
   end