Simplify moderator check when showing changeset comments

[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 9a86bded590ea8c143634480a01023514f1d2be5..ceed10978d9b614dbab6fa16298189ee9b5565ea 100644 (file)
--- a/app/controllers/api/old_controller.rb
+++ b/app/controllers/api/old_controller.rb
@@ -2,41 +2,40 @@
 # into one place. as it turns out, the API methods for historical
 # nodes, ways and relations are basically identical.
 module Api
 # into one place. as it turns out, the API methods for historical
 # nodes, ways and relations are basically identical.
 module Api

-  class OldController < ApplicationController
+  class OldController < ApiController

     require "xml/libxml"
 
     require "xml/libxml"
 

-    skip_before_action :verify_authenticity_token
+    before_action :check_api_readable
+    before_action :check_api_writable, :only => [:redact]

     before_action :setup_user_auth, :only => [:history, :version]
     before_action :setup_user_auth, :only => [:history, :version]

-    before_action :api_deny_access_handler

     before_action :authorize, :only => [:redact]
 
     authorize_resource
 
     before_action :authorize, :only => [:redact]
 
     authorize_resource
 

-    before_action :check_api_readable
-    before_action :check_api_writable, :only => [:redact]

     around_action :api_call_handle_error, :api_call_timeout
     before_action :lookup_old_element, :except => [:history]
     before_action :lookup_old_element_versions, :only => [:history]
 
     around_action :api_call_handle_error, :api_call_timeout
     before_action :lookup_old_element, :except => [:history]
     before_action :lookup_old_element_versions, :only => [:history]
 

+    before_action :set_request_formats, :except => [:redact]
+

     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 if @elements.empty?
 
     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 if @elements.empty?
 

-      doc = OSM::API.new.get_xml_doc
-
-      visible_elements = if show_redactions?
-                           @elements
-                         else
-                           @elements.unredacted
-                         end
-
-      visible_elements.each do |element|
-        doc.root << element.to_xml_node
+      # determine visible elements
+      @elems = if show_redactions?
+                 @elements
+               else
+                 @elements.unredacted
+               end
+
+      # Render the result
+      respond_to do |format|
+        format.xml
+        format.json

       end
       end

-
-      render :xml => doc.to_s

     end
 
     def version
     end
 
     def version


@@ -46,10 +45,11 @@ module Api
       else
         response.last_modified = @old_element.timestamp
 
       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
+          format.json
+        end

       end
     end
 
       end
     end