Skip to content

Add ElementsController base class #5479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Add ElementsController base class #5479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e74273d
Add ElementsController base class
AntonKhorev Jan 6, 2025
23488f2
Move browse/feature template to elements/show
AntonKhorev Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/controllers/elements_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
14 changes: 1 addition & 13 deletions app/controllers/nodes_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 1 addition & 13 deletions app/controllers/relations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 1 addition & 13 deletions app/controllers/ways_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
0 app/views/browse/feature.html.erb → app/views/elements/show.html.erb
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions test/controllers/nodes_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def test_routes

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
Expand All @@ -23,7 +23,7 @@ def test_show

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
Expand All @@ -33,13 +33,13 @@ def test_show_relation_member
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
Expand All @@ -53,7 +53,7 @@ def test_show_redacted

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
Expand Down
6 changes: 3 additions & 3 deletions test/controllers/relations_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def test_routes

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
Expand All @@ -23,7 +23,7 @@ def test_show

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
Expand All @@ -33,7 +33,7 @@ def test_show_relation_member
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

Expand Down
6 changes: 3 additions & 3 deletions test/controllers/ways_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def test_routes

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
Expand All @@ -23,7 +23,7 @@ def test_show

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
Expand All @@ -33,7 +33,7 @@ def test_show_relation_member
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

Expand Down
Loading