Merge pull request #35 from tomhughes/routing

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

diff --git a/app/controllers/old_relation_controller.rb b/app/controllers/old_relation_controller.rb
index 85cac89e787ea3b1259a3c20802aa81ae9de2c96..0cb3b2747e2e76e781a1e217d1b474c13d2a2c14 100644 (file)
--- a/app/controllers/old_relation_controller.rb
+++ b/app/controllers/old_relation_controller.rb
@@ -1,75 +1,12 @@
-class OldRelationController < ApplicationController
-  require 'xml/libxml'
+class OldRelationController < OldController
 
-  skip_before_filter :verify_authenticity_token
-  before_filter :setup_user_auth, :only => [ :history, :version ]
-  before_filter :authorize, :only => [ :redact ]
-  before_filter :authorize_moderator, :only => [ :redact ]
-  before_filter :require_allow_write_api, :only => [ :redact ]
-  before_filter :check_api_readable
-  before_filter :check_api_writable, :only => [ :redact ]
-  before_filter :lookup_old_relation, :except => [ :history ]
-  after_filter :compress_output
-  around_filter :api_call_handle_error, :api_call_timeout
-
-  def history
-    relation = Relation.find(params[:id].to_i)
-    
-    doc = OSM::API.new.get_xml_doc
-    
-    visible_relations = if @user and @user.moderator? and params[:show_redactions] == "true"
-                          relation.old_relations
-                        else
-                          relation.old_relations.unredacted
-                        end
-    
-    visible_relations.each do |old_relation|
-      doc.root << old_relation.to_xml_node
-    end
-    
-    render :text => doc.to_s, :content_type => "text/xml"
-  end
+  private
   
-  def version
-    if @old_relation.redacted? and not (@user and @user.moderator? and params[:show_redactions] == "true")
-      render :nothing => true, :status => :forbidden
-    else
-
-      response.last_modified = @old_relation.timestamp
-      
-      doc = OSM::API.new.get_xml_doc
-      doc.root << @old_relation.to_xml_node
-        
-      render :text => doc.to_s, :content_type => "text/xml"
-    end
+  def lookup_old_element
+    @old_element = OldRelation.find([params[:id], params[:version]])
   end
 
-  def redact
-    redaction_id = params['redaction']
-    unless redaction_id.nil?
-      # if a redaction ID was specified, then set this relation to
-      # be redacted in that redaction. (TODO: check that the
-      # user doing the redaction owns the redaction object too)
-      redaction = Redaction.find(redaction_id.to_i)
-      @old_relation.redact!(redaction)
-      
-    else
-      # if no redaction ID was provided, then this is an unredact
-      # operation.
-      @old_relation.redact!(nil)
-    end
-    
-    # just return an empty 200 OK for success
-    render :nothing => true
-  end
-
-  private
-  
-  def lookup_old_relation
-    @old_relation = OldRelation.where(:relation_id => params[:id], :version => params[:version]).first
-    if @old_relation.nil?
-      render :nothing => true, :status => :not_found
-      return false
-    end
+  def lookup_old_element_versions
+    @elements = OldRelation.where(:relation_id => params[:id]).order(:version)
   end
 end