From 57ceda5672bf45b4193bf30df0a5fdde4b18138c Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Tue, 20 Oct 2015 16:46:15 +0200
Subject: [PATCH] Bug 8436: QA Follow-up: Add Library to result list

If we offer a library filter, we should also show the
library in the result list, so that search options
and result list match.

Otherwise, for libraries with multiple branches, there
is no way to see, which is the subscription of a
specific branch in the list.

- Add a Library column in the result list
- Rename branch to library in the template

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/serials/checkexpiration.tt           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
index 1859fafb22..551338a5da 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -2,6 +2,7 @@
 <title>Koha &rsaquo; Serials &rsaquo; Check expiration</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
+[% USE Branches %]
 <script type="text/javascript" language="JavaScript">
 // <![CDATA[
     /**
@@ -43,7 +44,7 @@
 
     <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="post" onsubmit="return CheckForm(this);">
 <fieldset class="rows">
-    <legend>Filter results :</legend>
+    <legend>Filter results:</legend>
     
          <ol>
         <li><label for="title">Title:</label>
@@ -52,7 +53,7 @@
         <li><label for="issn">ISSN:</label>
         <input id="issn" type="text" name="issn" size="15" value="[% issn %]" /></li>
         [% IF (branches_loop.size) %]
-        <li><label for="branch">Branch:</label>
+        <li><label for="branch">Library:</label>
         <select id="branch" name="branch">
             <option value="">All</option>
             [% FOREACH branch IN branches_loop %]
@@ -94,6 +95,7 @@
         <tr>
             <th>ISSN</th>
             <th>Title</th>
+            [% IF ( branches_loop.size ) %]<th>Library</th>[% END %]
             <th>OPAC note</th>
             <th>Nonpublic note</th>
             <th>Expiration date</th>
@@ -115,6 +117,9 @@
                 [% END %]
                 </a>
             </td>
+            [% IF ( branches_loop.size ) %]<td>
+                [% Branches.GetName( subscriptions_loo.branchcode ) %]
+            </td>[% END %]
             <td>
                 [% subscriptions_loo.notes %]
             </td>
-- 
2.20.1