From fb692feffc2613d73ce79f97bc32108c8a56d0fd Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 16 Jun 2020 21:34:52 +0000
Subject: [PATCH] Bug 25871: Add "only library" to OpacItemLocation options

This patch adds a new option to the OpacItemLocation system preference,
"only library." It also rewords the descriptions of the existing options
in order to make their use more clear.

To test, apply the patch and make sure your OPACXSLTResultsDisplay
system preference is set to "default."

Test the OPAC search results using each of the OpacItemLocation
preference options:

- location: "library, location, and call number," e.g.

  "Availability: Items available for loan: Athens (1).
   Location(s): Athens new book shelf Call number: JNF 952.025 Bl."

- ccode: "library, collection code, and call number," e.g.

  "Availability: Items available for loan: Athens (1).
   Collection(s): Juvenile non-fiction Call number: JNF 952.025 Bl."

- callnum: "library and call number," e.g.

  "Availability: Items available for loan: AthensCall number: JNF
   952.025 Bl (1)."

- library: "only library," e.g."

  "Availability: Items available for loan: Athens (1)."
---
 .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref      | 7 ++++---
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl   | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index a0c0672223..2998436d75 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -389,9 +389,10 @@ OPAC:
             - Show
             - pref: OpacItemLocation
               choices:
-                  location: location
-                  ccode: "collection code"
-                  callnum: "call number only"
+                  location: "library, location, and call number"
+                  ccode: "library, collection code, and call number"
+                  callnum: "library and call number"
+                  library: "only library"
             - for items on the OPAC search results.
         -
             - pref: OpacPasswordChange
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
index c3a5d7c592..396b71a1c7 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
@@ -1244,7 +1244,7 @@
                    <xsl:when test="$singleBranchMode=1">
                        <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
                            <span class="ItemSummary">
-                               <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
+                               <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
                                    <span class="CallNumberAndLabel">
                                        <span class="LabelCallNumber">Call number: </span>
                                        <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
@@ -1325,7 +1325,7 @@
                                     <span class="ItemBranch"><xsl:value-of select="items:homebranch"/><xsl:text> </xsl:text></span>
                                 </xsl:if>
                                 <span class='notforloandesc'><xsl:value-of select="items:substatus"/></span>
-                                <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
+                                <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
                                     <span class="CallNumberAndLabel">
                                         <span class="LabelCallNumber">Call number: </span>
 							    <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
@@ -1360,7 +1360,7 @@
 					    <span class="ItemBranch"><xsl:value-of select="items:homebranch"/><xsl:text> </xsl:text></span>
                                     </xsl:if>
                                       <span class='notforloandesc'><xsl:value-of select="items:substatus"/></span>
-                                      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
+                                      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
                                           <span class="CallNumberAndLabel">
                                               <span class="LabelCallNumber">Call number: </span>
 							          <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
-- 
2.11.0