Bugzilla – Attachment 23745 Details for
Bug 6886
Single branch mode should disable showing the branch name in front of all callnumbers
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers
PASSED-QA-Bug-6886---Single-branch-mode-should-dis.patch (text/plain), 6.52 KB, created by
Katrin Fischer
on 2013-12-21 11:06:31 UTC
(
hide
)
Description:
[PASSED QA] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-12-21 11:06:31 UTC
Size:
6.52 KB
patch
obsolete
>From 9462da578c74f630fd21a3d812def2acc68d5f67 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 4 Jan 2013 13:40:33 -0500 >Subject: [PATCH] [PASSED QA] Bug 6886 - Single branch mode should disable > showing the branch name in front of all callnumbers > >Followup - Copies available for reference > >Test plan: Enable singleBranchMode and OPACXSLTResultsDisplay. Perform >a search in the OPAC which returns results containing not-for-loan >items. Before the patch these items will show their library in search >results loan items. After the patch there will be not be a library >listed, matching other items in results. > >Signed-off-by jmbroust <jean-manuel.broust@univ-lyon2.fr> > >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Comments on second patch. >--- > .../prog/en/xslt/MARC21slim2OPACResults.xsl | 22 +++++++++++++++------- > .../prog/en/xslt/NORMARCslim2OPACResults.xsl | 6 +++++- > .../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 6 +++++- > 3 files changed, 25 insertions(+), 9 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >index addc7de..f3550d6 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >@@ -1062,7 +1062,11 @@ > </xsl:when> > <xsl:otherwise> > <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]"> >- <xsl:value-of select="items:homebranch"/> >+ <xsl:choose> >+ <xsl:when test="$singleBranchMode=0"> >+ <xsl:value-of select="items:homebranch"/> >+ </xsl:when> >+ </xsl:choose> > <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if> > <xsl:text> (</xsl:text> > <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/> >@@ -1082,12 +1086,16 @@ > <b><xsl:text>Copies available for reference: </xsl:text></b> > <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/> > <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]"> >- <xsl:value-of select="items:homebranch"/> >- <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if> >- <xsl:text> (</xsl:text> >- <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/> >- <xsl:text> )</xsl:text> >- <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose> >+ <xsl:choose> >+ <xsl:when test="$singleBranchMode=0"> >+ <xsl:value-of select="items:homebranch"/> >+ </xsl:when> >+ </xsl:choose> >+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if> >+ <xsl:text> (</xsl:text> >+ <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/> >+ <xsl:text> )</xsl:text> >+ <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose> > </xsl:for-each> > </span> > </xsl:when> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl >index 58ce6d9..6c274bc 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl >@@ -814,7 +814,11 @@ > <xsl:variable name="reference_items" > select="key('item-by-status', 'reference')"/> > <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]"> >- <xsl:value-of select="items:homebranch"/> >+ <xsl:choose> >+ <xsl:when test="$singleBranchMode=0"> >+ <xsl:value-of select="items:homebranch"/> >+ </xsl:when> >+ </xsl:choose> > > <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if> > <xsl:text> (</xsl:text> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl >index ebf94b9..21193e5 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl >@@ -178,7 +178,11 @@ > <xsl:variable name="reference_items" > select="key('item-by-status', 'reference')"/> > <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]"> >- <xsl:value-of select="items:homebranch"/> >+ <xsl:choose> >+ <xsl:when test="$singleBranchMode=0"> >+ <xsl:value-of select="items:homebranch"/> >+ </xsl:when> >+ </xsl:choose> > <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">[<xsl:value-of select="items:itemcallnumber"/>]</xsl:if> > <xsl:text> (</xsl:text> > <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/> >-- >1.8.3.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6886
:
11367
|
11369
|
11370
|
11501
|
11502
|
11504
|
14434
|
15065
|
16028
|
16385
|
16391
|
17289
|
23304
| 23745 |
23746