gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 26302: (QA follow-up) Prevent empty call numbers 

This does not make the code easier, but here we go:

Suppose resultsMaxItems == 2.
If we would normally list two call numbers like:
    Liberty (2) [Call number: PERL F 1, PERL F 2].
If one call number would be empty, we now list:
    Liberty (2) [Call number: PERL F 1, ...].
And when both are empty, we only show a number:
    Liberty (2).

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Marcel de Rooy 2021-08-09 11:55:11 +00:00 committed by Jonathan Druart
parent 174554bb4d
commit eb752d7e24
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
View File

@ -1476,7 +1476,7 @@
<xsl:text> (</xsl:text>
<xsl:value-of select="count($items)"/>
<xsl:text>)</xsl:text>
<xsl:if test="$max>0 and $OPACItemLocation!='library'">
<xsl:if test="$max>0 and count($items[items:itemcallnumber!=''])>0 and $OPACItemLocation!='library'">
<span class="CallNumberAndLabel">
<span class="LabelCallNumber">
<xsl:if test="$OPACItemLocation='callnum'">Call number: </xsl:if>
@ -1484,16 +1484,21 @@
<xsl:if test="$OPACItemLocation='location'">Location, call number: </xsl:if>
</span>
<span class="CallNumber">
<xsl:for-each select="$items[position() &lt;= $max]">
<xsl:for-each select="$items[items:itemcallnumber!=''][position() &lt;= $max]">
<xsl:if test="$OPACItemLocation='location'">
<strong><xsl:value-of select="concat(items:location,' ')"/></strong>
</xsl:if>
<xsl:if test="$OPACItemLocation='ccode'">
<strong><xsl:value-of select="concat(items:ccode,' ')"/></strong>
</xsl:if>
<xsl:value-of select="items:itemcallnumber"/><xsl:if test="position()!=last()"><xsl:text>, </xsl:text></xsl:if>
<xsl:value-of select="items:itemcallnumber"/>
<xsl:if test="position()!=last()">
<xsl:text>, </xsl:text>
</xsl:if>
<xsl:if test="position()=last() and (count($items)>$max or count($items[items:itemcallnumber=''])>0)">
<xsl:text>, ..</xsl:text>
</xsl:if>
</xsl:for-each>
<xsl:if test="count($items)>$max"><xsl:text>, ..</xsl:text></xsl:if>
</span>
</span>
</xsl:if>