From 4a8ee8eb2b24b292f0a441792e03836832f43c57 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 13 Aug 2015 16:55:07 +0000
Subject: [PATCH] Foundry: Some bugfixes

git-svn-id: https://svn.libreccm.org/ccm/trunk@3573 8810af33-2d31-482b-a856-94f89814c4df
---
 .../content-items/scipublications.xsl         | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
index 4dfb91aae..7134bbf56 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
@@ -24,10 +24,29 @@
                 xmlns:cms="http://www.arsdigita.com/cms/1.0"
                 xmlns:foundry="http://foundry.libreccm.org"
                 xmlns:nav="http://ccm.redhat.com/navigation"
+                xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
                 xmlns:ui="http://www.arsdigita.com/ui/1.0"
-                exclude-result-prefixes="xsl xs bebop cms foundry nav ui"
+                exclude-result-prefixes="xsl xs bebop cms foundry nav terms ui"
                 version="2.0">
     
+    <xsl:template match="content-item-layout//scipublications//assigned-terms">
+        <xsl:variable name="separator">
+            <xsl:value-of select="./@separator"/>
+        </xsl:variable>
+        
+        <xsl:for-each select="./domain">
+            <xsl:variable name="domain">
+                <xsl:value-of select="normalize-space(.)"/>
+            </xsl:variable>
+            
+            <xsl:if test="$data-tree/terms:assignedTerms">
+                <xsl:value-of select="if(position() &lt; count($data-tree//terms:assignedTerms/terms:term[@domain=$domain]))
+                                      then concat(./@name, $separator)
+                                      else ./@name"/>
+            </xsl:if>
+        </xsl:for-each>
+    </xsl:template>
+    
     <xsl:template match="content-item-layout//scipublications//authors">
         <xsl:param name="contentitem-tree" tunnel="yes"/>
         
@@ -727,8 +746,8 @@
         <xsl:if test="$contentitem-tree/papers">
             <xsl:apply-templates>
                 <xsl:with-param name="papers"
-                                    tunnel="yes"
-                                    select="$contentitem-tree/papers"/>
+                                tunnel="yes"
+                                select="$contentitem-tree/papers"/>
             </xsl:apply-templates>
         </xsl:if>
     </xsl:template>