cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move browse history template to old elements directory

Browse source
This commit is contained in:
Anton Khorev 2025-01-04 17:22:38 +03:00
parent ccf71302e9
commit c992d51fe2
7 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/old_nodes_controller.rb
View file

@ -2,7 +2,6 @@ class OldNodesController < OldElementsController
def index def index
@type = "node" @type = "node"
@feature = Node.preload(:node_tags, :old_nodes => [:old_tags, { :changeset => [:changeset_tags, :user] }]).find(params[:id]) @feature = Node.preload(:node_tags, :old_nodes => [:old_tags, { :changeset => [:changeset_tags, :user] }]).find(params[:id])
render "browse/history"
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render "browse/not_found", :status => :not_found render "browse/not_found", :status => :not_found
end end

1
app/controllers/old_relations_controller.rb
View file

@ -2,7 +2,6 @@ class OldRelationsController < OldElementsController
def index def index
@type = "relation" @type = "relation"
@feature = Relation.preload(:relation_tags, :old_relations => [:old_tags, { :changeset => [:changeset_tags, :user], :old_members => :member }]).find(params[:id]) @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 rescue ActiveRecord::RecordNotFound
render "browse/not_found", :status => :not_found render "browse/not_found", :status => :not_found
end end

1
app/controllers/old_ways_controller.rb
View file

@ -2,7 +2,6 @@ class OldWaysController < OldElementsController
def index def index
@type = "way" @type = "way"
@feature = Way.preload(:way_tags, :old_ways => [:old_tags, { :changeset => [:changeset_tags, :user], :old_nodes => { :node => [:node_tags, :ways] } }]).find(params[:id]) @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 rescue ActiveRecord::RecordNotFound
render "browse/not_found", :status => :not_found render "browse/not_found", :status => :not_found
end end

0
app/views/browse/history.html.erb → app/views/old_elements/index.html.erb
View file

6
test/controllers/old_nodes_controller_test.rb
View file

@ -14,7 +14,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
def test_history def test_history
node = create(:node, :with_history) node = create(:node, :with_history)
sidebar_browse_check :node_history_path, node.id, "browse/history" sidebar_browse_check :node_history_path, node.id, "old_elements/index"
assert_select "h4", /^Version/ do assert_select "h4", /^Version/ do
assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1 assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
end end
@ -27,7 +27,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
get node_history_path(:id => node) get node_history_path(:id => node)
assert_response :success assert_response :success
assert_template "browse/history" assert_template "old_elements/index"
# there are 2 revisions of the redacted node, but only one # there are 2 revisions of the redacted node, but only one
# should be showing details here. # should be showing details here.
@ -46,7 +46,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
get node_history_path(:id => node, :params => { :show_redactions => true }) get node_history_path(:id => node, :params => { :show_redactions => true })
assert_response :success assert_response :success
assert_template "browse/history" assert_template "old_elements/index"
assert_select ".browse-section", 2 assert_select ".browse-section", 2
assert_select ".browse-section.browse-redacted", 0 assert_select ".browse-section.browse-redacted", 0

6
test/controllers/old_relations_controller_test.rb
View file

@ -14,7 +14,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest
def test_history def test_history
relation = create(:relation, :with_history) relation = create(:relation, :with_history)
sidebar_browse_check :relation_history_path, relation.id, "browse/history" sidebar_browse_check :relation_history_path, relation.id, "old_elements/index"
assert_select "h4", /^Version/ do assert_select "h4", /^Version/ do
assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1 assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
end end
@ -29,7 +29,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest
get relation_history_path(:id => relation) get relation_history_path(:id => relation)
assert_response :success assert_response :success
assert_template "browse/history" assert_template "old_elements/index"
# there are 4 revisions of the redacted relation, but only 2 # there are 4 revisions of the redacted relation, but only 2
# should be showing details here. # should be showing details here.
@ -48,7 +48,7 @@ class OldRelationsControllerTest < ActionDispatch::IntegrationTest
get relation_history_path(:id => relation, :params => { :show_redactions => true }) get relation_history_path(:id => relation, :params => { :show_redactions => true })
assert_response :success assert_response :success
assert_template "browse/history" assert_template "old_elements/index"
assert_select ".browse-section", 4 assert_select ".browse-section", 4
assert_select ".browse-section.browse-redacted", 0 assert_select ".browse-section.browse-redacted", 0

6
test/controllers/old_ways_controller_test.rb
View file

@ -14,7 +14,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
def test_history def test_history
way = create(:way, :with_history) way = create(:way, :with_history)
sidebar_browse_check :way_history_path, way.id, "browse/history" sidebar_browse_check :way_history_path, way.id, "old_elements/index"
assert_select "h4", /^Version/ do assert_select "h4", /^Version/ do
assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1 assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
end end
@ -29,7 +29,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
get way_history_path(:id => way) get way_history_path(:id => way)
assert_response :success assert_response :success
assert_template "browse/history" assert_template "old_elements/index"
# there are 4 revisions of the redacted way, but only 2 # there are 4 revisions of the redacted way, but only 2
# should be showing details here. # should be showing details here.
@ -48,7 +48,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
get way_history_path(:id => way, :params => { :show_redactions => true }) get way_history_path(:id => way, :params => { :show_redactions => true })
assert_response :success assert_response :success
assert_template "browse/history" assert_template "old_elements/index"
assert_select ".browse-section", 4 assert_select ".browse-section", 4
assert_select ".browse-section.browse-redacted", 0 assert_select ".browse-section.browse-redacted", 0