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

diff --git a/app/controllers/elements_controller.rb b/app/controllers/elements_controller.rb
new file mode 100644 (file)
index 0000000..99c8afe
--- /dev/null
+++ b/app/controllers/elements_controller.rb
@@ -0,0 +1,12 @@
+class ElementsController < 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
+end

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index a05fa8cd2455ced0d35476e6502f3e4c0557f6a5..0ef07dbbfc689772637c4fdffc3e2affc31802d0 100644 (file)
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -1,19 +1,7 @@
-class NodesController < 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 NodesController < ElementsController
   def show
     @type = "node"
     @feature = Node.preload(:node_tags, :containing_relation_members, :changeset => [:changeset_tags, :user], :ways => :way_tags).find(params[:id])
-    render "browse/feature"
   rescue ActiveRecord::RecordNotFound
     render "browse/not_found", :status => :not_found
   end

diff --git a/app/controllers/relations_controller.rb b/app/controllers/relations_controller.rb
index 8aeefd6cccec983d13ab103d2f5e76de5bf3bc8b..9199c9e4a633a5d3945a94d5cf2c923efb45772d 100644 (file)
--- a/app/controllers/relations_controller.rb
+++ b/app/controllers/relations_controller.rb
@@ -1,19 +1,7 @@
-class RelationsController < 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 RelationsController < ElementsController
   def show
     @type = "relation"
     @feature = Relation.preload(:relation_tags, :containing_relation_members, :changeset => [:changeset_tags, :user], :relation_members => :member).find(params[:id])
-    render "browse/feature"
   rescue ActiveRecord::RecordNotFound
     render "browse/not_found", :status => :not_found
   end

diff --git a/app/controllers/ways_controller.rb b/app/controllers/ways_controller.rb
index d4abe2db7fca9e289d4e5ef163241fa26d120a50..d5c5d8736004f50672f3878787df11db86efeec5 100644 (file)
--- a/app/controllers/ways_controller.rb
+++ b/app/controllers/ways_controller.rb
@@ -1,19 +1,7 @@
-class WaysController < 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 WaysController < ElementsController
   def show
     @type = "way"
     @feature = Way.preload(:way_tags, :containing_relation_members, :changeset => [:changeset_tags, :user], :nodes => [:node_tags, { :ways => :way_tags }]).find(params[:id])
-    render "browse/feature"
   rescue ActiveRecord::RecordNotFound
     render "browse/not_found", :status => :not_found
   end

diff --git a/app/views/browse/feature.html.erb b/app/views/elements/show.html.erb
similarity index 100%
rename from app/views/browse/feature.html.erb
rename to app/views/elements/show.html.erb

diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index a294327231d78ca0b54b5e5f338ae305f27221d6..6db340c214123c026501ad711263468d0c776d35 100644 (file)
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -12,7 +12,7 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
 
   def test_show
     node = create(:node)
-    sidebar_browse_check :node_path, node.id, "browse/feature"
+    sidebar_browse_check :node_path, node.id, "elements/show"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
     end
@@ -23,7 +23,7 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
 
   def test_show_multiple_versions
     node = create(:node, :with_history, :version => 2)
-    sidebar_browse_check :node_path, node.id, "browse/feature"
+    sidebar_browse_check :node_path, node.id, "elements/show"
     assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1
@@ -33,13 +33,13 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
     member = create(:node)
     relation = create(:relation)
     create(:relation_member, :relation => relation, :member => member)
-    sidebar_browse_check :node_path, member.id, "browse/feature"
+    sidebar_browse_check :node_path, member.id, "elements/show"
     assert_select "a[href='#{relation_path relation}']", :count => 1
   end
 
   def test_show_deleted
     node = create(:node, :visible => false)
-    sidebar_browse_check :node_path, node.id, "browse/feature"
+    sidebar_browse_check :node_path, node.id, "elements/show"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
     end
@@ -53,7 +53,7 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
 
     get node_path(node)
     assert_response :success
-    assert_template "feature"
+    assert_template "elements/show"
 
     # check that we don't show lat/lon for a redacted node.
     assert_select ".browse-section", 1

diff --git a/test/controllers/relations_controller_test.rb b/test/controllers/relations_controller_test.rb
index bdcbd2fd7bf386df6d0e49887761394808fbff1f..0f07a1a4a3b042927e4877db454fed5366ee86fe 100644 (file)
--- a/test/controllers/relations_controller_test.rb
+++ b/test/controllers/relations_controller_test.rb
@@ -12,7 +12,7 @@ class RelationsControllerTest < ActionDispatch::IntegrationTest
 
   def test_show
     relation = create(:relation)
-    sidebar_browse_check :relation_path, relation.id, "browse/feature"
+    sidebar_browse_check :relation_path, relation.id, "elements/show"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
     end
@@ -23,7 +23,7 @@ class RelationsControllerTest < ActionDispatch::IntegrationTest
 
   def test_show_multiple_versions
     relation = create(:relation, :with_history, :version => 2)
-    sidebar_browse_check :relation_path, relation.id, "browse/feature"
+    sidebar_browse_check :relation_path, relation.id, "elements/show"
     assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_relation_path relation, 2}']", :count => 1
@@ -33,7 +33,7 @@ class RelationsControllerTest < ActionDispatch::IntegrationTest
     member = create(:relation)
     relation = create(:relation)
     create(:relation_member, :relation => relation, :member => member)
-    sidebar_browse_check :relation_path, member.id, "browse/feature"
+    sidebar_browse_check :relation_path, member.id, "elements/show"
     assert_select "a[href='#{relation_path relation}']", :count => 1
   end
 

diff --git a/test/controllers/ways_controller_test.rb b/test/controllers/ways_controller_test.rb
index 995004cb4179236a95c8998263b90e872ae9366b..5b80a070cffcd7ef0e7d04f43b5561ccea6d9c93 100644 (file)
--- a/test/controllers/ways_controller_test.rb
+++ b/test/controllers/ways_controller_test.rb
@@ -12,7 +12,7 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
 
   def test_show
     way = create(:way)
-    sidebar_browse_check :way_path, way.id, "browse/feature"
+    sidebar_browse_check :way_path, way.id, "elements/show"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
     end
@@ -23,7 +23,7 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
 
   def test_show_multiple_versions
     way = create(:way, :with_history, :version => 2)
-    sidebar_browse_check :way_path, way.id, "browse/feature"
+    sidebar_browse_check :way_path, way.id, "elements/show"
     assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1
@@ -33,7 +33,7 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
     member = create(:way)
     relation = create(:relation)
     create(:relation_member, :relation => relation, :member => member)
-    sidebar_browse_check :way_path, member.id, "browse/feature"
+    sidebar_browse_check :way_path, member.id, "elements/show"
     assert_select "a[href='#{relation_path relation}']", :count => 1
   end