Bugzilla – Attachment 2530 Details for
Bug 4385
With XSLT on, results list doesn't show both hardcopy and URL availability
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch for bug 4385
bug4385.patch.txt (text/plain), 5.38 KB, created by
Ian Walls
on 2010-08-17 13:23:39 UTC
(
hide
)
Description:
Proposed patch for bug 4385
Filename:
MIME Type:
Creator:
Ian Walls
Created:
2010-08-17 13:23:39 UTC
Size:
5.38 KB
patch
obsolete
> >Delivered-To: ian.walls@bywatersolutions.com >Received: by 10.14.37.140 with SMTP id y12cs146902eea; > Tue, 17 Aug 2010 06:12:08 -0700 (PDT) >Received: by 10.101.164.25 with SMTP id r25mr7445907ano.254.1282050728047; > Tue, 17 Aug 2010 06:12:08 -0700 (PDT) >Return-Path: <koha@dev.bywatersolutions.com> >Received: from dev.bywatersolutions.com (dev.bywatersolutions.com [174.143.239.187]) > by mx.google.com with ESMTP id k3si7092925anc.158.2010.08.17.06.12.07; > Tue, 17 Aug 2010 06:12:07 -0700 (PDT) >Received-SPF: pass (google.com: best guess record for domain of koha@dev.bywatersolutions.com designates 174.143.239.187 as permitted sender) client-ip=174.143.239.187; >Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of koha@dev.bywatersolutions.com designates 174.143.239.187 as permitted sender) smtp.mail=koha@dev.bywatersolutions.com >Received: by dev.bywatersolutions.com (Postfix, from userid 1000) > id 6680B30066; Tue, 17 Aug 2010 13:12:05 +0000 (UTC) >From: Ian Walls <ian.walls@bywatersolutions.com> >To: koha-patches@dev.bywatersolutions.com >Cc: Ian Walls <ian.walls@bywatersolutions.com> >Subject: [PATCH] fixes bug 4385 >Date: Tue, 17 Aug 2010 09:12:05 -0400 >Message-Id: <1282050725-19651-1-git-send-email-ian.walls@bywatersolutions.com> >X-Mailer: git-send-email 1.5.6.5 >Content-Type: text/plain; charset="utf-8" > >--- > .../prog/en/xslt/MARC21slim2OPACResults.xsl | 22 ++++++++++---------- > 1 files changed, 11 insertions(+), 11 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >index 65e14e5..320c293 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >@@ -893,11 +893,9 @@ > </xsl:for-each> > </span> > </xsl:if> >- >- <span class="results_summary"> >- <span class="label">Availability: </span> >- <xsl:choose> >- <xsl:when test="marc:datafield[@tag=856]"> >+ <xsl:if test="marc:datafield[@tag=856]"> >+ <span class="results_summary"> >+ <span class="label">Online Access: </span> > <xsl:for-each select="marc:datafield[@tag=856]"> > <xsl:if test="$OPACURLOpenInNewWindow='0'"> > <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute> >@@ -942,13 +940,15 @@ > </a> > </xsl:if> > <xsl:choose> >- <xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when> >+ <xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when> > <xsl:otherwise> | </xsl:otherwise> > </xsl:choose> > </xsl:for-each> >- </xsl:when> >- >- >+ </span> >+ </xsl:if> >+ <span class="results_summary"> >+ <span class="label">Availability: </span> >+ <xsl:choose> > <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">No copies available > </xsl:when> > <xsl:when test="count(key('item-by-status', 'available'))>0"> >@@ -958,7 +958,7 @@ > select="key('item-by-status', 'available')"/> > <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:if test="items:itemcallnumber != '' and items:itemcallnumber">[<xsl:value-of select="items:itemcallnumber"/>]</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)))"/> > <xsl:text>)</xsl:text> >@@ -976,7 +976,7 @@ > 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: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> >-- >1.5.6.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 4385
:
2058
|
2059
|
2060
| 2530 |
2536