[pull] master from kitodo:master

Kitodo/src/main/java/org/kitodo/production/services/data/UserService.java

@@ -164,8 +164,7 @@ public List<User> loadData(int first, int pageSize, String sortField, SortOrder
      *             if no unique user can be found
      */
     public User getByLdapLoginOrLogin(String login) {
-        List<User> users = getByLoginQuery(login, "from User where ldapLogin = :login");
-        users.addAll(getByLoginQuery(login, "from User where login = :login"));
+        List<User> users = getByLoginQuery(login, "from User where ldapLogin = :login or login = :login");
         return uniqueResult(users, login);
     }
 
@@ -175,6 +174,8 @@ public User getByLdapLoginOrLogin(String login) {
      * @param login
      *            The login.
      * @return The user.
+     * @throws UsernameNotFoundException
+     *             if no unique user can be found
      */
     public User getByLogin(String login) {
         List<User> users = getByLoginQuery(login, "from User where login = :login");

Kitodo/src/main/webapp/WEB-INF/templates/includes/metadataEditor/logicalStructure.xhtml

@@ -129,8 +129,7 @@
             <p:treeNode type="#{StructurePanel.VIEW_NODE_TYPE}"
                         icon="ui-icon-document">
                 <h:outputText value="#{empty logicalNode.label ? msgs['dataEditor.withoutType'] : logicalNode.label}"
-                              title="#{logicalNode.undefined ? msgs['dataEditor.undefinedStructure'] : ''}"
-                              rendered="#{DataEditorForm.structurePanel.titleMetadata eq 'type'}"/>
+                              title="#{logicalNode.undefined ? msgs['dataEditor.undefinedStructure'] : ''}"/>
                 <h:outputText value="#{DataEditorForm.structurePanel.getMultipleAssignmentsIndex(logicalNode) + 1}"
                               rendered="#{logicalNode.assignedSeveralTimes}"
                               styleClass="assigned-several-times"/>

Kitodo/src/test/java/org/kitodo/production/services/data/UserServiceIT.java

@@ -247,4 +247,16 @@ public void shouldGetAuthenticatedUser() throws DAOException {
         assertEquals("Returned authenticated user was wrong", "kowal", authenticatedUser.getLogin());
         SecurityTestUtils.cleanSecurityContext();
     }
+
+    @Test
+    public void returnCorrectUserIndependentOfLoginOrLdapLoginByLogin() {
+        User user = userService.getByLdapLoginOrLogin("verylast");
+        assertEquals("Returned user was wrong", "User, Very last", user.getFullName());
+    }
+
+    @Test
+    public void returnCorrectUserIndependentOfLoginOrLdapLoginByLdapLogin() {
+        User user = userService.getByLdapLoginOrLogin("doraLDP");
+        assertEquals("Returned user was wrong", "Dora, Anna", user.getFullName());
+    }
 }

pom.xml

@@ -266,7 +266,7 @@ from system library in Java 11+ -->
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>activemq-client</artifactId>
-                <version>5.17.2</version>
+                <version>5.17.6</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.slf4j</groupId>