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

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

diff --git a/app/controllers/old_ways_controller.rb b/app/controllers/old_ways_controller.rb
index c8185c633dd7c605deb58bbc3134f047a37d1a65..de60de317fde2ed5c89e5e6d675b51e545d69ebe 100644 (file)
--- a/app/controllers/old_ways_controller.rb
+++ b/app/controllers/old_ways_controller.rb
@@ -1,11 +1,34 @@
-class OldWaysController < OldController
-  private
+class OldWaysController < 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
+
+  before_action :require_moderator_for_unredacted_history
+  around_action :web_timeout

 
 

-  def lookup_old_element
-    @old_element = OldWay.find([params[:id], params[:version]])
+  def index
+    @type = "way"
+    @feature = Way.preload(:way_tags, :old_ways => [:old_tags, { :changeset => [:changeset_tags, :user], :old_nodes => { :node => [:node_tags, :ways] } }]).find(params[:id])
+    render "browse/history"
+  rescue ActiveRecord::RecordNotFound
+    render "browse/not_found", :status => :not_found

   end
 
   end
 

-  def lookup_old_element_versions
-    @elements = OldWay.where(:way_id => params[:id]).order(:version)
+  def show
+    @type = "way"
+    @feature = OldWay.preload(:old_tags, :changeset => [:changeset_tags, :user], :old_nodes => { :node => [:node_tags, :ways] }).find([params[:id], params[:version]])
+  rescue ActiveRecord::RecordNotFound
+    render :action => "not_found", :status => :not_found
+  end
+
+  private
+
+  def require_moderator_for_unredacted_history
+    deny_access(nil) if params[:show_redactions] && !current_user&.moderator?

   end
 end
   end
 end