LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- BugFixes for Foundry (12h time format used hour instead of minute) 

- Added auditing trail of the *current* version to traversal adapter


git-svn-id: https://svn.libreccm.org/ccm/trunk@3845 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2016-02-08 09:57:39 +00:00
parent efeb00b776
commit 25eb8f2941
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccm-cms/src/WEB-INF/resources/cms-item-adapters.xml
View File

@ -59,6 +59,9 @@
<xrd:attributes rule="exclude"> <xrd:attributes rule="exclude">
</xrd:attributes> </xrd:attributes>
<xrd:associations rule="include"> <xrd:associations rule="include">
<xrd:property name="/object/auditing"/>
<xrd:property name="/object/auditing/creationUser"/>
<xrd:property name="/object/auditing/lastModifiedUser"/>
<xrd:property name="/object/masterVersion"/> <xrd:property name="/object/masterVersion"/>
<xrd:property name="/object/masterVersion/auditing"/> <xrd:property name="/object/masterVersion/auditing"/>
<xrd:property name="/object/masterVersion/auditing/creationUser"/> <xrd:property name="/object/masterVersion/auditing/creationUser"/>

2
ccm-core/web/themes/foundry/foundry/lib/template-parser.xsl
View File

@ -854,7 +854,7 @@
<xsl:variable name="minute"> <xsl:variable name="minute">
<xsl:choose> <xsl:choose>
<xsl:when test="string-length($minute-value) &lt; 2"> <xsl:when test="string-length($minute-value) &lt; 2">
<xsl:value-of select="concat('0', $hour-value)"/> <xsl:value-of select="concat('0', $minute-value)"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="$minute-value"/> <xsl:value-of select="$minute-value"/>

27
ccm-core/web/themes/foundry/foundry/lib/template-tags/navigation.xsl
View File

@ -173,9 +173,20 @@
<xsl:variable name="navigation-id" <xsl:variable name="navigation-id"
select="foundry:get-attribute-value(current(), 'navigation-id', 'categoryMenu')"/> select="foundry:get-attribute-value(current(), 'navigation-id', 'categoryMenu')"/>
<xsl:apply-templates> <xsl:apply-templates>
<xsl:with-param name="href" <!--<xsl:with-param name="href"
select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url" select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url"
tunnel="yes"/> tunnel="yes"/>-->
<xsl:with-param name="href"
tunnel="yes">
<xsl:choose>
<xsl:when test="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url">
<xsl:value-of select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@url"/>
</xsl:when>
<xsl:when test="$data-tree//nav:categoryPath/nav:category/@url">
<xsl:value-of select="$data-tree//nav:categoryPath/nav:category/@url"/>
</xsl:when>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="navigation-id" select="$navigation-id" tunnel="yes"/> <xsl:with-param name="navigation-id" select="$navigation-id" tunnel="yes"/>
<xsl:with-param name="title" tunnel="yes"> <xsl:with-param name="title" tunnel="yes">
<xsl:choose> <xsl:choose>
@ -185,7 +196,14 @@
<xsl:value-of select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title"/> <xsl:value-of select="$data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="foundry:get-static-text('navigation', $data-tree//nav:categoryMenu[@id=$navigation-id]/@navigation-id, false())"/> <xsl:choose>
<xsl:when test="$data-tree//nav:categoryMenu[@id=$navigation-id]/@navigation-id">
<xsl:value-of select="foundry:get-static-text('navigation', $data-tree//nav:categoryMenu[@id=$navigation-id]/@navigation-id, false())"/>
</xsl:when>
<xsl:when test="$data-tree//nav:categoryPath/@navigation-id">
<xsl:value-of select="foundry:get-static-text('navigation', $data-tree//nav:categoryPath[@id=$navigation-id]/@navigation-id, false())"/>
</xsl:when>
</xsl:choose>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
@ -212,6 +230,9 @@
<xsl:when test="string-length($data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title) &gt; 0"> <xsl:when test="string-length($data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title) &gt; 0">
<xsl:value-of select="foundry:shying($data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title)"/> <xsl:value-of select="foundry:shying($data-tree//nav:categoryMenu[@id=$navigation-id]/nav:category/@title)"/>
</xsl:when> </xsl:when>
<xsl:when test="string-length($data-tree//nav:categoryPath/nav:category/@title) &gt; 0">
<xsl:value-of select="foundry:shying($data-tree/nav:categoryPath/nav:category/@title)"/>
</xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="''"/> <xsl:value-of select="''"/>
</xsl:otherwise> </xsl:otherwise>