Merge branch 'master' into patch/view_migration

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

diff --git a/app/controllers/api/old_controller.rb b/app/controllers/api/old_controller.rb
index 9d9f2fabc656d6421ee6d987e94c85d63cb681ab..49fdcf1a3b4c13f13f8427e5336620753b95ed4d 100644 (file)
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -6,7 +6,6 @@ module Api
     require "xml/libxml"
 
     before_action :setup_user_auth, :only => [:history, :version]
-    before_action :api_deny_access_handler
     before_action :authorize, :only => [:redact]
 
     authorize_resource
@@ -23,19 +22,17 @@ module Api
       # to do that ourselves.
       raise OSM::APINotFoundError if @elements.empty?
 
-      doc = OSM::API.new.get_xml_doc
+      # determine visible elements
+      @elems = if show_redactions?
+                 @elements
+               else
+                 @elements.unredacted
+               end
 
-      visible_elements = if show_redactions?
-                           @elements
-                         else
-                           @elements.unredacted
-                         end
-
-      visible_elements.each do |element|
-        doc.root << element.to_xml_node
+      # Render the result
+      respond_to do |format|
+        format.xml
       end
-
-      render :xml => doc.to_s
     end
 
     def version
@@ -45,10 +42,10 @@ module Api
       else
         response.last_modified = @old_element.timestamp
 
-        doc = OSM::API.new.get_xml_doc
-        doc.root << @old_element.to_xml_node
-
-        render :xml => doc.to_s
+        # Render the result
+        respond_to do |format|
+          format.xml
+        end
       end
     end