Merge branch 'pull/5228'

[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..d57cf25fe070dc3d3a278650ede0c2d049c67e89 100644 (file)
--- a/app/controllers/old_relations_controller.rb
+++ b/app/controllers/old_relations_controller.rb
@@ -8,12 +8,27 @@ class OldRelationsController < ApplicationController
 
   authorize_resource
 
 
   authorize_resource
 

+  before_action :require_moderator_for_unredacted_history

   around_action :web_timeout
 
   around_action :web_timeout
 

+  def index
+    @type = "relation"
+    @feature = Relation.preload(:relation_tags, :old_relations => [:old_tags, { :changeset => [:changeset_tags, :user], :old_members => :member }]).find(params[:id])
+    render "browse/history"
+  rescue ActiveRecord::RecordNotFound
+    render "browse/not_found", :status => :not_found
+  end
+

   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
   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

+
+  private
+
+  def require_moderator_for_unredacted_history
+    deny_access(nil) if params[:show_redactions] && !current_user&.moderator?
+  end

 end
 end