Merge remote-tracking branch 'upstream/pull/4518'

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

diff --git a/app/controllers/old_relations_controller.rb b/app/controllers/old_relations_controller.rb
index 40c450376a8e435cc8981c44cd9892ce15160653..9dda82021e21c46afe81db153d93fe51478ee201 100644 (file)
--- a/app/controllers/old_relations_controller.rb
+++ b/app/controllers/old_relations_controller.rb
@@ -1,11 +1,19 @@
-class OldRelationsController < OldController
-  private
+class OldRelationsController < ApplicationController
+  layout :map_layout

 
 

-  def lookup_old_element
-    @old_element = OldRelation.find([params[:id], params[:version]])
-  end
+  before_action :authorize_web
+  before_action :set_locale
+  before_action -> { check_database_readable(:need_api => true) }
+  before_action :require_oauth
+
+  authorize_resource
+
+  around_action :web_timeout

 
 

-  def lookup_old_element_versions
-    @elements = OldRelation.where(:relation_id => params[:id]).order(:version)
+  def show
+    @type = "relation"
+    @feature = OldRelation.preload(:old_tags, :changeset => [:changeset_tags, :user], :old_members => :member).find([params[:id], params[:version]])
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found

   end
 end
   end
 end