Merge pull request #171 from hudmol/40848483-notes-display

Add Notes to the component sidebar and readonly views. Delivers: https://www.pivotaltracker.com/story/show/40848483
edsu · Dec 7, 2012 · 2eaccf4 · 2eaccf4
2 parents 49dc53f + 5861afa
commit 2eaccf4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/frontend/app/views/archival_objects/_show_inline.html.erb b/frontend/app/views/archival_objects/_show_inline.html.erb
@@ -33,6 +33,10 @@
         <%= render :partial => "linked_agents/show", :locals => { :linked_agents => @archival_object.linked_agents, :section_id => "archival_object_linked_agents_" } %>
       <% end %>
 
+      <% if @archival_object.notes.length > 0 %>
+        <%= render :partial => "notes/show", :locals => { :notes => @archival_object.notes, :context => readonly } %>
+      <% end %>
+
       <% if @archival_object.extents.length > 0 %>
         <%= render :partial => "extents/show", :locals => { :extents => @archival_object.extents, :section_id => "archival_object_extents_" } %>
       <% end %>

diff --git a/frontend/app/views/archival_objects/_sidebar.html.erb b/frontend/app/views/archival_objects/_sidebar.html.erb
@@ -5,6 +5,10 @@
     <% if controller.action_name != "show" || @archival_object.linked_agents.length > 0 %>
       <li><a href="#archival_object_linked_agents_">Agent Links <span class="icon-chevron-right"></span></a></li>
     <% end %>
+    
+    <% if not controller.action_name === "show" or @archival_object.notes.length > 0 %>
+      <li><a href="#notes">Notes <span class="icon-chevron-right"></span></a></li>
+    <% end %>
 
     <% if controller.action_name != "show" || @archival_object.extents.length > 0 %>
       <li><a href="#archival_object_extents_">Extents <span class="icon-chevron-right"></span></a></li>

diff --git a/frontend/app/views/digital_object_components/_show_inline.html.erb b/frontend/app/views/digital_object_components/_show_inline.html.erb
@@ -33,6 +33,10 @@
       <% if @digital_object_component.linked_agents.length > 0 %>
         <%= render :partial => "linked_agents/show", :locals => { :linked_agents => @digital_object_component.linked_agents, :section_id => "digital_object_component_linked_agents_" } %>
       <% end %>
+      
+      <% if @digital_object_component.notes.length > 0 %>
+        <%= render :partial => "notes/show", :locals => { :notes => @digital_object_component.notes, :context => readonly } %>
+      <% end %>
 
       <% if @digital_object_component.extents.length > 0 %>
         <%= render :partial => "extents/show", :locals => { :extents => @digital_object_component.extents, :section_id => "digital_object_component_extents_" } %>

diff --git a/frontend/app/views/digital_object_components/_sidebar.html.erb b/frontend/app/views/digital_object_components/_sidebar.html.erb
@@ -5,6 +5,10 @@
     <% if controller.action_name != "show" || @digital_object_component.linked_agents.length > 0 %>
       <li><a href="#digital_object_component_linked_agents_">Agent Links <span class="icon-chevron-right"></span></a></li>
     <% end %>
+    
+    <% if not controller.action_name === "show" or @digital_object_component.notes.length > 0 %>
+      <li><a href="#notes">Notes <span class="icon-chevron-right"></span></a></li>
+    <% end %>
 
     <% if controller.action_name != "show" || @digital_object_component.extents.length > 0 %>
       <li><a href="#digital_object_component_extents_">Extents <span class="icon-chevron-right"></span></a></li>