Bugzilla – Attachment 23304 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]
Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers - QA Followup
Bug-6886---Single-branch-mode-should-disable-showi.patch (text/plain), 5.56 KB, created by
Kyle M Hall (khall)
on 2013-12-04 17:24:57 UTC
(
hide
)
Description:
Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers - QA Followup
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-12-04 17:24:57 UTC
Size:
5.56 KB
patch
obsolete
>From b3f650a240f10c60fe24669293a0655b17fdbe13 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Wed, 4 Dec 2013 12:24:38 -0500 >Subject: [PATCH] Bug 6886 - Single branch mode should disable showing the branch name in front of all callnumbers - QA Followup > >--- > .../prog/en/xslt/MARC21slim2OPACResults.xsl | 16 ++++++---------- > .../prog/en/xslt/NORMARCslim2OPACResults.xsl | 7 ++----- > .../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 8 +++----- > 3 files changed, 11 insertions(+), 20 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >index f3550d6..689641c 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >@@ -1062,11 +1062,9 @@ > </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:choose> >- <xsl:when test="$singleBranchMode=0"> >- <xsl:value-of select="items:homebranch"/> >- </xsl:when> >- </xsl:choose> >+ <xsl:if test="$singleBranchMode=0"> >+ <xsl:value-of select="items:homebranch"/> >+ </xsl:if> > <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)))"/> >@@ -1086,11 +1084,9 @@ > <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:choose> >- <xsl:when test="$singleBranchMode=0"> >- <xsl:value-of select="items:homebranch"/> >- </xsl:when> >- </xsl:choose> >+ <xsl:if test="$singleBranchMode=0"> >+ <xsl:value-of select="items:homebranch"/> >+ </xsl:if> > <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)))"/> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl >index 6c274bc..5f4b533 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl >@@ -814,12 +814,9 @@ > <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:choose> >- <xsl:when test="$singleBranchMode=0"> >+ <xsl:if test="$singleBranchMode=0"> > <xsl:value-of select="items:homebranch"/> >- </xsl:when> >- </xsl:choose> >- >+ </xsl:if> > <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)))"/> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl >index 21193e5..9dde821 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslim2OPACResults.xsl >@@ -178,11 +178,9 @@ > <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:choose> >- <xsl:when test="$singleBranchMode=0"> >- <xsl:value-of select="items:homebranch"/> >- </xsl:when> >- </xsl:choose> >+ <xsl:if test="$singleBranchMode=0"> >+ <xsl:value-of select="items:homebranch"/> >+ </xsl:if> > <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.7.2.5
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