From: Tom Hughes Date: Thu, 22 Sep 2022 17:04:28 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/3710' X-Git-Tag: live~980 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d60042335136bdbe34ecd86dfbe4bb5e9050045e?hp=19a014bde6c8eb0c1b394fae8cf302487e7717b0 Merge remote-tracking branch 'upstream/pull/3710' --- diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb index c5c26330e..86b9020a2 100644 --- a/app/views/browse/feature.html.erb +++ b/app/views/browse/feature.html.erb @@ -5,7 +5,9 @@ <%= render :partial => @type, :object => @feature %>
- <%= link_to(t("browse.download_xml"), :controller => "api/#{@type.pluralize}", :action => :show) %> - · + <% if @feature.visible? %> + <%= link_to(t("browse.download_xml"), :controller => "api/#{@type.pluralize}", :action => :show) %> + · + <% end %> <%= link_to(t("browse.view_history"), :action => "#{@type}_history") %>
diff --git a/test/controllers/browse_controller_test.rb b/test/controllers/browse_controller_test.rb index 7ad16dcd9..cde9403d0 100644 --- a/test/controllers/browse_controller_test.rb +++ b/test/controllers/browse_controller_test.rb @@ -63,7 +63,15 @@ class BrowseControllerTest < ActionDispatch::IntegrationTest end def test_read_node - browse_check :node_path, create(:node).id, "browse/feature" + node = create :node + browse_check :node_path, node.id, "browse/feature" + assert_select "a[href='#{api_node_path node}']", :count => 1 + end + + def test_read_deleted_node + node = create :node, :visible => false + browse_check :node_path, node.id, "browse/feature" + assert_select "a[href='#{api_node_path node}']", :count => 0 end def test_read_node_history