Add OldElementsController base class

diff --git a/app/controllers/old_elements_controller.rb b/app/controllers/old_elements_controller.rb
new file mode 100644 (file)
index 0000000..02c999b
--- /dev/null
+++ b/app/controllers/old_elements_controller.rb
@@ -0,0 +1,19 @@
+class OldElementsController < 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
+
+  private
+
+  def require_moderator_for_unredacted_history
+    deny_access(nil) if params[:show_redactions] && !current_user&.moderator?
+  end
+end

diff --git a/app/controllers/old_nodes_controller.rb b/app/controllers/old_nodes_controller.rb
index 596b579673649c4bcd806c628dd8a8218a8344ed..86ef4c235d3ff32d9ae635b4c2909fcc957ca3de 100644 (file)
--- a/app/controllers/old_nodes_controller.rb
+++ b/app/controllers/old_nodes_controller.rb
@@ -1,16 +1,4 @@
-class OldNodesController < 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
-
+class OldNodesController < OldElementsController

   def index
     @type = "node"
     @feature = Node.preload(:node_tags, :old_nodes => [:old_tags, { :changeset => [:changeset_tags, :user] }]).find(params[:id])
   def index
     @type = "node"
     @feature = Node.preload(:node_tags, :old_nodes => [:old_tags, { :changeset => [:changeset_tags, :user] }]).find(params[:id])


@@ -25,10 +13,4 @@ class OldNodesController < ApplicationController
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
   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

diff --git a/app/controllers/old_relations_controller.rb b/app/controllers/old_relations_controller.rb
index d57cf25fe070dc3d3a278650ede0c2d049c67e89..ea4fb6d120c486529d798ff4df9e7f587acbd03d 100644 (file)
--- a/app/controllers/old_relations_controller.rb
+++ b/app/controllers/old_relations_controller.rb
@@ -1,16 +1,4 @@
-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
-
-  before_action :require_moderator_for_unredacted_history
-  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])
   def index
     @type = "relation"
     @feature = Relation.preload(:relation_tags, :old_relations => [:old_tags, { :changeset => [:changeset_tags, :user], :old_members => :member }]).find(params[:id])


@@ -25,10 +13,4 @@ class OldRelationsController < ApplicationController
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
   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

diff --git a/app/controllers/old_ways_controller.rb b/app/controllers/old_ways_controller.rb
index de60de317fde2ed5c89e5e6d675b51e545d69ebe..fe8814b2fcf2c2739fa0126ec588231645ad6a83 100644 (file)
--- a/app/controllers/old_ways_controller.rb
+++ b/app/controllers/old_ways_controller.rb
@@ -1,16 +1,4 @@
-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
-
+class OldWaysController < OldElementsController

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


@@ -25,10 +13,4 @@ class OldWaysController < ApplicationController
   rescue ActiveRecord::RecordNotFound
     render :action => "not_found", :status => :not_found
   end
   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