MIR-1336 Display realname of creator/modifier in mir-admin-box (#1031)

Possommi · web-flow · commit 06849996aad3 · 2024-08-30T10:11:12.000+02:00
* MIR-1341 Shorten texts for createdby and modifiedby in mir-admindata-box.xsl

* MIR-1336 Display realname of creator in mir-admin-box

* MIR-1336 Added template print-user-info to mir-admindata-box.xsl

* MIR-1336 Minor layout fix

* MIR-1336 Display real name of user as headline rather than username (which might be an uuid, when user is authenticated by shibboleth)

* MIR-1336 Added blank after colon

* MIR-1336 Fixed MIRUserController

* MIR-1336 Fixed mir-module/pom.xml

* MIR-1336 Check for administrate-users privilege
diff --git a/mir-it/src/test/java/org/mycore/mir/it/controller/MIRUserController.java b/mir-it/src/test/java/org/mycore/mir/it/controller/MIRUserController.java
@@ -128,7 +128,7 @@ protected void assertEqualsIgnoreCase(String message, String expected, String ac
     }
 
     public void assertUserCreated(String user) {
-        driver.waitFor(ExpectedConditions.titleContains("Nutzerdaten anzeigen:" + user));
+        driver.waitFor(ExpectedConditions.titleContains("Nutzerdaten anzeigen: " + user));
     }
 
     public void assertValidationErrorVisible() {
diff --git a/mir-module/src/main/resources/xsl/metadata/mir-admindata-box.xsl b/mir-module/src/main/resources/xsl/metadata/mir-admindata-box.xsl
@@ -2,9 +2,11 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:xlink="http://www.w3.org/1999/xlink"
                 xmlns:i18n="xalan://org.mycore.services.i18n.MCRTranslation" xmlns:mods="http://www.loc.gov/mods/v3"
+                xmlns:mcracl="xalan://org.mycore.access.MCRAccessManager"
                 xmlns:mcrxsl="xalan://org.mycore.common.xml.MCRXMLFunctions"
-                exclude-result-prefixes="i18n mods xlink mcrxsl">
+                exclude-result-prefixes="i18n mcracl mods xlink mcrxsl">
   <xsl:import href="xslImport:modsmeta:metadata/mir-admindata-box.xsl"/>
+  <xsl:param name="WebApplicationBaseURL"/>
 
   <xsl:template match="/">
     <xsl:variable name="ID" select="/mycoreobject/@ID"/>
@@ -30,9 +32,10 @@
               <xsl:with-param select="mycoreobject/service/servdates/servdate[@type='createdate']" name="nodes"/>
               <xsl:with-param select="i18n:translate('metaData.createdAt')" name="label"/>
             </xsl:call-template>
-            <xsl:call-template name="printMetaDate">
-              <xsl:with-param select="mycoreobject/service/servflags/servflag[@type='createdby']" name="nodes"/>
-              <xsl:with-param select="i18n:translate('mir.metaData.detailBox.by')" name="label"/>
+
+            <xsl:call-template name="print-user-info">
+              <xsl:with-param name="user" select="document(concat('notnull:user:', mycoreobject/service/servflags/servflag[@type='createdby']))"/>
+              <xsl:with-param name="label" select="i18n:translate('mir.metaData.detailBox.by')"/>
             </xsl:call-template>
             <xsl:for-each select="mycoreobject/metadata/def.modsContainer/modsContainer/mods:mods/mods:note">
               <xsl:variable name="noteType">
@@ -65,9 +68,9 @@
               <xsl:with-param select="mycoreobject/service/servdates/servdate[@type='modifydate']" name="nodes"/>
               <xsl:with-param select="i18n:translate('metaData.lastChanged')" name="label"/>
             </xsl:call-template>
-            <xsl:call-template name="printMetaDate">
-              <xsl:with-param select="mycoreobject/service/servflags/servflag[@type='modifiedby']" name="nodes"/>
-              <xsl:with-param select="i18n:translate('mir.metaData.detailBox.by')" name="label"/>
+            <xsl:call-template name="print-user-info">
+              <xsl:with-param name="user" select="document(concat('notnull:user:', mycoreobject/service/servflags/servflag[@type='modifiedby']))"/>
+              <xsl:with-param name="label" select="i18n:translate('mir.metaData.detailBox.by')"/>
             </xsl:call-template>
             <!--*** MyCoRe-ID and intern ID *************************** -->
             <tr>
@@ -126,4 +129,44 @@
     <xsl:apply-imports/>
   </xsl:template>
 
+  <xsl:template name="print-user-info">
+    <xsl:param name="user"/>
+    <xsl:param name="label"/>
+
+    <xsl:variable name="display-name">
+      <xsl:choose>
+        <xsl:when test="$user/user/realName">
+          <xsl:value-of select="$user/user/realName"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$user/user/@name"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <tr>
+      <td class="metaname">
+        <xsl:value-of select="concat($label, ':')"/>
+      </td>
+
+      <td class="metavalue">
+        <xsl:if test="$user/user/realName">
+          <xsl:attribute name="title">
+            <xsl:value-of select="concat($user/user/@name, '@', $user/user/@realm)"/>
+          </xsl:attribute>
+        </xsl:if>
+
+        <xsl:choose>
+          <xsl:when test="mcracl:checkPermission('POOLPRIVILEGE', 'administrate-users')">
+            <a href="{$WebApplicationBaseURL}servlets/MCRUserServlet?action=show&amp;id={$user/user/@name}">
+              <xsl:value-of select="$display-name"/>
+            </a>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$display-name"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </td>
+    </tr>
+  </xsl:template>
 </xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xsl/modsdetails-external.xsl b/mir-module/src/main/resources/xsl/modsdetails-external.xsl
@@ -485,7 +485,7 @@
                     </li -->
                   </xsl:when>
                   <xsl:otherwise>
-                    <li>
+                    <li class="dropdown-item">
                       <xsl:value-of select="i18n:translate('object.locked')" />
                     </li>
                   </xsl:otherwise>
diff --git a/mir-module/src/main/resources/xsl/user.xsl b/mir-module/src/main/resources/xsl/user.xsl
@@ -11,7 +11,9 @@
 
   <xsl:variable name="PageID" select="'show-user'" />
 
-  <xsl:variable name="PageTitle" select="concat(i18n:translate('component.user2.admin.userDisplay'),/user/@name)" />
+  <xsl:variable name="PageTitle">
+    <xsl:call-template name="user-display-name"/>
+  </xsl:variable>
 
   <xsl:param name="step" />
   <xsl:param name="MCR.ORCID.LinkURL" />
@@ -79,7 +81,7 @@
       </div>
       <div class="clearfix" />
       <h2>
-        <xsl:value-of select="concat(i18n:translate('component.user2.admin.userDisplay'),@name)" />
+        <xsl:call-template name="user-display-name"/>
       </h2>
       <xsl:if test="$step = 'confirmDelete'">
         <div class="section alert alert-danger">
@@ -429,4 +431,15 @@
     </xsl:if>
   </xsl:template>
 
+  <xsl:template name="user-display-name">
+    <xsl:choose>
+      <xsl:when test="/user/realName">
+        <xsl:value-of select="concat(i18n:translate('component.user2.admin.userDisplay'), ' ', /user/realName)"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="concat(i18n:translate('component.user2.admin.userDisplay'), ' ', /user/@name)"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 </xsl:stylesheet>
diff --git a/mir-module/src/main/resources/xslt/metadata/mods-metadata-page.xsl b/mir-module/src/main/resources/xslt/metadata/mods-metadata-page.xsl
@@ -280,6 +280,11 @@
   </xsl:template>
   <xsl:template match="td[@class='metavalue']" mode="newMetadata" priority="2">
     <dd>
+      <xsl:if test="@title">
+        <xsl:attribute name="title">
+          <xsl:value-of select="@title"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:copy-of select="node()|*"/>
     </dd>
   </xsl:template>

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ protected void assertEqualsIgnoreCase(String message, String expected, String ac`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`public void assertUserCreated(String user) {`
`131`		`- driver.waitFor(ExpectedConditions.titleContains("Nutzerdaten anzeigen:" + user));`
	`131`	`+ driver.waitFor(ExpectedConditions.titleContains("Nutzerdaten anzeigen: " + user));`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public void assertValidationErrorVisible() {`