Merge remote-tracking branch 'origin/master'

SpeciesFileGroup · Nov 14, 2014 · 949fb09 · 949fb09
2 parents d414e6a + 736da9f
commit 949fb09
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/app/views/notes/_object_pane.html.erb b/app/views/notes/_object_pane.html.erb
@@ -0,0 +1,10 @@
+<div class="object_pane">
+  <h3> Notes </h3>
+  <ul>
+    <% object.notes.each do |note| -%>
+      <li> <%= note.text -%> </li>
+    <% end %>
+  </ul>
+
+  <%= content_tag(:em, 'No attached notes.') if !object.notes.any? -%>
+</div>
diff --git a/app/views/shared/data/_show.html.erb b/app/views/shared/data/_show.html.erb
@@ -18,6 +18,7 @@
     <div class="attributes">
       <%= render partial: '/shared/data/show/housekeeping', locals: {object: object} -%>
       <%= render(partial: '/shared/data/show/soft_validation', locals: {object: object}) if object.class.respond_to?(:soft_validates?) -%>
+      <%= render(partial: '/notes/object_pane', locals: {object: object}) if object.respond_to?(:notes) %>
     </div>
   </div>