Skip to content

Commit 16c492c

Browse files
committed
MIR-1336 Display realname of creator in mir-admin-box-static
1 parent 622b475 commit 16c492c

File tree

2 files changed

+42
-7
lines changed

2 files changed

+42
-7
lines changed

mir-module/src/main/resources/xsl/metadata/static/mir-admindata-box-static.xsl

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030
<xsl:with-param select="mycoreobject/service/servdates/servdate[@type='createdate']" name="nodes"/>
3131
<xsl:with-param select="i18n:translate('metaData.createdAt')" name="label"/>
3232
</xsl:call-template>
33-
<xsl:call-template name="printMetaDate">
34-
<xsl:with-param select="mycoreobject/service/servflags/servflag[@type='createdby']" name="nodes"/>
35-
<xsl:with-param select="i18n:translate('metaData.createdby')" name="label"/>
33+
34+
<xsl:call-template name="print-user-info">
35+
<xsl:with-param name="user" select="document(concat('notnull:user:', mycoreobject/service/servflags/servflag[@type='createdby']))"/>
36+
<xsl:with-param name="label" select="i18n:translate('metaData.createdby')"/>
3637
</xsl:call-template>
38+
3739
<xsl:for-each select="mycoreobject/metadata/def.modsContainer/modsContainer/mods:mods/mods:note">
3840
<xsl:variable name="noteType">
3941
<xsl:choose>
@@ -65,10 +67,12 @@
6567
<xsl:with-param select="mycoreobject/service/servdates/servdate[@type='modifydate']" name="nodes"/>
6668
<xsl:with-param select="i18n:translate('metaData.lastChanged')" name="label"/>
6769
</xsl:call-template>
68-
<xsl:call-template name="printMetaDate">
69-
<xsl:with-param select="mycoreobject/service/servflags/servflag[@type='modifiedby']" name="nodes"/>
70-
<xsl:with-param select="i18n:translate('metaData.modifiedBy')" name="label"/>
70+
71+
<xsl:call-template name="print-user-info">
72+
<xsl:with-param name="user" select="document(concat('notnull:user:', mycoreobject/service/servflags/servflag[@type='modifiedby']))"/>
73+
<xsl:with-param name="label" select="i18n:translate('metaData.modifiedBy')"/>
7174
</xsl:call-template>
75+
7276
<!--*** MyCoRe-ID and intern ID *************************** -->
7377
<tr>
7478
<td class="metaname">
@@ -129,4 +133,30 @@
129133
</div>
130134
</div>
131135
</xsl:template>
132-
</xsl:stylesheet>
136+
137+
<xsl:template name="print-user-info">
138+
<xsl:param name="user"/>
139+
<xsl:param name="label"/>
140+
141+
<tr>
142+
<td class="metaname">
143+
<xsl:value-of select="concat($label, ':')"/>
144+
</td>
145+
<td class="metavalue">
146+
<xsl:choose>
147+
<xsl:when test="$user/user/realName">
148+
<xsl:attribute name="title">
149+
<xsl:value-of select="$user/user/@name"/>
150+
</xsl:attribute>
151+
<xsl:value-of select="$user/user/realName"/>
152+
</xsl:when>
153+
<xsl:otherwise>
154+
<xsl:value-of select="$user/user/@name"/>
155+
</xsl:otherwise>
156+
</xsl:choose>
157+
</td>
158+
</tr>
159+
160+
</xsl:template>
161+
162+
</xsl:stylesheet>

mir-module/src/main/resources/xslt/metadata/mods-metadata-page.xsl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,11 @@
228228
</xsl:template>
229229
<xsl:template match="td[@class='metavalue']" mode="newMetadata" priority="2">
230230
<dd>
231+
<xsl:if test="@title">
232+
<xsl:attribute name="title">
233+
<xsl:value-of select="@title"/>
234+
</xsl:attribute>
235+
</xsl:if>
231236
<xsl:copy-of select="node()|*"/>
232237
</dd>
233238
</xsl:template>

0 commit comments

Comments
 (0)