fix setting holding items

next-l · Nov 22, 2015 · af771e6 · af771e6
1 parent 563f024
commit af771e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/app/views/manifestations/_show_detail_librarian.html.erb b/app/views/manifestations/_show_detail_librarian.html.erb
@@ -112,8 +112,8 @@
         </tr>
       </table>
     <% end %>
-      <%- if manifestation.items.on_shelf.exists? -%>
-        <%= render 'manifestations/show_holding', manifestation: manifestation -%>
+      <%- if manifestation.items.exists? -%>
+        <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items %>
       <%- end -%>
     </div>
     <%= render 'manifestations/tab_list', manifestation: manifestation %>

diff --git a/app/views/manifestations/_show_detail_user.html.erb b/app/views/manifestations/_show_detail_user.html.erb
@@ -113,7 +113,7 @@
       </table>
     <% end %>
       <%- if manifestation.items.for_checkout.on_shelf.exists? -%>
-        <%= render 'manifestations/show_holding', manifestation: manifestation -%>
+        <%= render 'manifestations/show_holding', manifestation: manifestation, items: manifestation.items.for_checkout.on_shelf %>
       <%- end -%>
     </div>
     <%= render 'manifestations/tab_list', manifestation: manifestation %>

diff --git a/app/views/manifestations/_show_holding.html.erb b/app/views/manifestations/_show_holding.html.erb
@@ -10,11 +10,6 @@
       <th><%= t('activerecord.models.circulation_status') -%></th>
     <% end %>
   </tr>
-  <% if current_user.try(:has_role?, 'Librarian') %>
-    <% items = manifestation.items %>
-  <% else %>
-    <% items = manifestation.items.for_checkout.on_shelf %>
-  <% end %>
   <%- items.each do |item| -%>
     <tr>
       <td>