Bugzilla – Attachment 124514 Details for
Bug 10265
8xx serial added entries need spaces and punctuation in XSLT display
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10265: (QA follow-up) Make if-else checks consistent
Bug-10265-QA-follow-up-Make-if-else-checks-consist.patch (text/plain), 2.96 KB, created by
Joonas Kylmälä
on 2021-09-05 12:16:21 UTC
(
hide
)
Description:
Bug 10265: (QA follow-up) Make if-else checks consistent
Filename:
MIME Type:
Creator:
Joonas Kylmälä
Created:
2021-09-05 12:16:21 UTC
Size:
2.96 KB
patch
obsolete
>From 1ce5770436c6001725cd6e35511712d3275a63c8 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= <joonas.kylmala@iki.fi> >Date: Sun, 5 Sep 2021 12:10:17 +0000 >Subject: [PATCH] Bug 10265: (QA follow-up) Make if-else checks consistent >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >The != '' version doesn't check for the whitespace existing and thus >might have added the punctuation without the partNumber or partName being >inserted at all. > >Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi> >--- > koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 4 ++-- > koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >index c9678499f0..dfc9cc0186 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >@@ -566,13 +566,13 @@ > <xsl:with-param name="afterCodes">fghkdlmor</xsl:with-param> > </xsl:call-template> > </xsl:variable> >- <xsl:if test="$partNumber != '' or $partName != ''" > >+ <xsl:if test="string-length(normalize-space($partNumber)) or string-length(normalize-space($partName))" > > <xsl:text>. </xsl:text> > </xsl:if> > <xsl:if test="string-length(normalize-space($partNumber))"> > <xsl:value-of select="$partNumber" /> > </xsl:if> >- <xsl:if test="$partNumber != ''"><xsl:text> </xsl:text></xsl:if> >+ <xsl:if test="string-length(normalize-space($partNumber))"><xsl:text> </xsl:text></xsl:if> > <xsl:if test="string-length(normalize-space($partName))"> > <xsl:value-of select="$partName" /> > </xsl:if> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl >index 4e918ea174..105da508c7 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl >@@ -530,13 +530,13 @@ > <xsl:with-param name="afterCodes">fghkdlmor</xsl:with-param> > </xsl:call-template> > </xsl:variable> >- <xsl:if test="$partNumber != '' or $partName != ''" > >+ <xsl:if test="string-length(normalize-space($partNumber)) or string-length(normalize-space($partName))" > > <xsl:text>. </xsl:text> > </xsl:if> > <xsl:if test="string-length(normalize-space($partNumber))"> > <xsl:value-of select="$partNumber" /> > </xsl:if> >- <xsl:if test="$partNumber != ''"><xsl:text> </xsl:text></xsl:if> >+ <xsl:if test="string-length(normalize-space($partNumber))"><xsl:text> </xsl:text></xsl:if> > <xsl:if test="string-length(normalize-space($partName))"> > <xsl:value-of select="$partName" /> > </xsl:if> >-- >2.20.1
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 10265
:
18179
|
18180
|
18239
|
124060
|
124129
|
124513
| 124514