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

[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 9dda82021e21c46afe81db153d93fe51478ee201..8c73eba24d40fad552b78e47ec15c6900ea09896 100644 (file)
--- a/app/controllers/old_relations_controller.rb
+++ b/app/controllers/old_relations_controller.rb
@@ -1,14 +1,10 @@
-class OldRelationsController < ApplicationController
-  layout :map_layout
-
-  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
+class OldRelationsController < OldElementsController
+  def index
+    @type = "relation"
+    @feature = Relation.preload(:relation_tags, :old_relations => [:old_tags, { :changeset => [:changeset_tags, :user], :old_members => :member }]).find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render "browse/not_found", :status => :not_found
+  end
 
   def show
     @type = "relation"