Link to details from node version pages

diff --git a/app/views/old_nodes/show.html.erb b/app/views/old_nodes/show.html.erb
index ba7c10ecb5b63f1d15af05709f9914e59e9cd884..b69c297233b89878f2f4b2720eea8c8c736c9823 100644 (file)
--- a/app/views/old_nodes/show.html.erb
+++ b/app/views/old_nodes/show.html.erb
@@ -4,11 +4,13 @@
 
 <%= render :partial => "browse/node", :object => @feature %>
 
 
 <%= render :partial => "browse/node", :object => @feature %>
 

-<% unless @feature.redacted? %>
-  <div class='secondary-actions'>
+<div class='secondary-actions'>
+  <% unless @feature.redacted? %>

     <%= link_to t("browse.download_xml"), node_version_path(*@feature.id) %>
     <%= link_to t("browse.download_xml"), node_version_path(*@feature.id) %>

-  </div>
-<% end %>
+    &middot;
+  <% end %>
+  <%= link_to t("browse.view_details"), node_path(@feature.node_id) %>
+</div>

 
 <div class='secondary-actions'>
   <% if @feature.version > 1 %>
 
 <div class='secondary-actions'>
   <% if @feature.version > 1 %>

diff --git a/test/controllers/old_nodes_controller_test.rb b/test/controllers/old_nodes_controller_test.rb
index 4263077c817914cfbee4fe185ca2d310260a1f25..3f2958bd3e49ecd82d04574d5f5eec5b7ed56ab0 100644 (file)
--- a/test/controllers/old_nodes_controller_test.rb
+++ b/test/controllers/old_nodes_controller_test.rb
@@ -18,6 +18,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
       assert_select "a[href='#{old_node_path node, 1}']", :count => 0
     end
     assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 1
       assert_select "a[href='#{old_node_path node, 1}']", :count => 0
     end
     assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 1

+    assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1

     assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
   end
 
     assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
   end
 


@@ -31,6 +32,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
       assert_select "a[href='#{old_node_path node, 1}']", :count => 0
     end
     assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 1
       assert_select "a[href='#{old_node_path node, 1}']", :count => 0
     end
     assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 1

+    assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1

     assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1
 
     assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1
 


@@ -42,6 +44,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
       assert_select "a[href='#{old_node_path node, 2}']", :count => 0
     end
     assert_select ".secondary-actions a[href='#{node_version_path node, 2}']", :count => 1
       assert_select "a[href='#{old_node_path node, 2}']", :count => 0
     end
     assert_select ".secondary-actions a[href='#{node_version_path node, 2}']", :count => 1

+    assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1

     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
   end
     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
   end


@@ -54,6 +57,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "old_nodes/show"
     assert_template :layout => "map"
     assert_response :success
     assert_template "old_nodes/show"
     assert_template :layout => "map"

+    assert_select ".secondary-actions a[href='#{node_path node}']", :count => 1

     assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0
     assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 0
   end
     assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 0
     assert_select ".secondary-actions a[href='#{node_version_path node, 1}']", :count => 0
   end