ensure unique user registry nodes in admin tree

clarin-eric · Feb 6, 2020 · 7f00472 · 7f00472
1 parent 5458dfc
commit 7f00472
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...ry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java b/...ry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java
@@ -48,6 +48,7 @@
 
 import javax.xml.bind.JAXBException;
 import javax.xml.transform.TransformerException;
+import org.apache.wicket.util.lang.Objects;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -846,8 +847,12 @@ public String getName() {
                 }
             }
         };
-        Optional<RegistryUser> u = userDao.findById(getUserId().longValue());
-        return "Registry of " + u.map(RegistryUser::getName).orElse("USER NOT FOUND");
+
+        final Optional<RegistryUser> u = userDao.findById(getUserId().longValue());
+        return "Registry of "
+                + u
+                        .map(ru -> Objects.equal(ru.getName(), ru.getPrincipalName()) ? ru.getName() : String.format("%s (%s)", ru.getName(), ru.getPrincipalName()))
+                        .orElse("USER NOT FOUND");
     }
 
     @Override
@@ -925,7 +930,6 @@ public void deleteComment(String commentId) throws IOException,
 
                 // Comment must have an existing (in this registry)
                 // componentId or profileId
-
                 this.checkAuthorisationComment(comment);
                 commentsDao.delete(comment);
             } else {