From ae24dcce4ab57d5ba98999b667a2562148c68028 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 24 Feb 2023 15:36:00 +0000
Subject: [PATCH] Bug 31123: Update Staff XSLT to include all subfields

This patch updates the XSLT sheets to include all subfields in your
selected ContentWarningField in display and handles converting the
subfield u if present to a hyperlink.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../en/xslt/MARC21slim2intranetDetail.xsl     | 28 ++++++++++++++-----
 .../en/xslt/MARC21slim2intranetResults.xsl    | 28 ++++++++++++++-----
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index d6414ac7ba..78f2043b57 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -1068,15 +1068,29 @@
                <span class="label">Content warning: </span>
                <xsl:for-each select="marc:datafield[@tag=$ContentWarningField]">
                    <xsl:choose>
-                       <xsl:when test="marc:subfield[@code='z']">
-                           <xsl:value-of select="marc:subfield[@code='z']"/><xsl:text> </xsl:text>
+                       <xsl:when test="marc:subfield[@code='u']">
+                           <a>
+                               <xsl:attribute name="href">
+                                   <xsl:value-of select="marc:subfield[@code='u']"/>
+                               </xsl:attribute>
+                               <xsl:choose>
+                                   <xsl:when test="marc:subfield[@code='a']">
+                                       <xsl:value-of select="marc:subfield[@code='a']"/>
+                                   </xsl:when>
+                                   <xsl:otherwise>
+                                       <xsl:value-of select="marc:subfield[@code='u']"/>
+                                   </xsl:otherwise>
+                               </xsl:choose>
+                           </a>
+                           <xsl:text> </xsl:text>
+                       </xsl:when>
+                       <xsl:when test="not(marc:subfield[@code='u']) and marc:subfield[@code='a']">
+                           <xsl:value-of select="marc:subfield[@code='a']"/><xsl:text> </xsl:text>
                        </xsl:when>
-                       <xsl:otherwise>
-                           <xsl:call-template name="subfieldSelect">
-                               <xsl:with-param name="codes">abcdefgijklnou</xsl:with-param>
-                           </xsl:call-template>
-                       </xsl:otherwise>
                    </xsl:choose>
+                   <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">bcdefghijklmnopqrstvwxyz</xsl:with-param>
+                   </xsl:call-template>
                    <xsl:if test="position()!=last()"><span class="separator"><xsl:text> | </xsl:text></span></xsl:if>
                </xsl:for-each>
            </span>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
index 098e6b0b54..5dbf57d1e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
@@ -1006,15 +1006,29 @@
             <span class="label">Content warning: </span>
             <xsl:for-each select="marc:datafield[@tag=$ContentWarningField]">
                 <xsl:choose>
-                    <xsl:when test="marc:subfield[@code='z']">
-                        <xsl:value-of select="marc:subfield[@code='z']"/><xsl:text> </xsl:text>
+                    <xsl:when test="marc:subfield[@code='u']">
+                        <a>
+                            <xsl:attribute name="href">
+                                <xsl:value-of select="marc:subfield[@code='u']"/>
+                            </xsl:attribute>
+                            <xsl:choose>
+                                <xsl:when test="marc:subfield[@code='a']">
+                                    <xsl:value-of select="marc:subfield[@code='a']"/>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="marc:subfield[@code='u']"/>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </a>
+                        <xsl:text> </xsl:text>
+                    </xsl:when>
+                    <xsl:when test="not(marc:subfield[@code='u']) and marc:subfield[@code='a']">
+                        <xsl:value-of select="marc:subfield[@code='a']"/><xsl:text> </xsl:text>
                     </xsl:when>
-                    <xsl:otherwise>
-                        <xsl:call-template name="subfieldSelect">
-                            <xsl:with-param name="codes">abcdefgijklnou</xsl:with-param>
-                        </xsl:call-template>
-                    </xsl:otherwise>
                 </xsl:choose>
+                <xsl:call-template name="subfieldSelect">
+                    <xsl:with-param name="codes">abcdefgijklnou</xsl:with-param>
+                </xsl:call-template>
                 <xsl:if test="position()!=last()"><span class="separator"><xsl:text> | </xsl:text></span></xsl:if>
             </xsl:for-each>
         </span>
-- 
2.39.5