From 5e0b39624adee1ddcfb5245e01468f0f5b67b103 Mon Sep 17 00:00:00 2001
From: Arved Solth <solth@effective-webwork.de>
Date: Tue, 23 Feb 2021 09:35:56 +0100
Subject: [PATCH 1/2] Sort lists initialy by first column

---
 .../WEB-INF/templates/includes/projects/docketList.xhtml      | 4 +++-
 .../WEB-INF/templates/includes/projects/projectList.xhtml     | 2 ++
 .../WEB-INF/templates/includes/projects/rulesetList.xhtml     | 4 +++-
 .../WEB-INF/templates/includes/projects/templateList.xhtml    | 2 ++
 .../WEB-INF/templates/includes/projects/workflowList.xhtml    | 2 ++
 .../webapp/WEB-INF/templates/includes/tasks/taskList.xhtml    | 4 +++-
 .../webapp/WEB-INF/templates/includes/users/clientList.xhtml  | 2 ++
 .../WEB-INF/templates/includes/users/ldapgroupList.xhtml      | 2 ++
 .../WEB-INF/templates/includes/users/ldapserverList.xhtml     | 2 ++
 .../webapp/WEB-INF/templates/includes/users/roleList.xhtml    | 2 ++
 .../webapp/WEB-INF/templates/includes/users/userList.xhtml    | 2 ++
 11 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/docketList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/docketList.xhtml
index 7a619a3d65f..2b47e626101 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/docketList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/docketList.xhtml
@@ -16,6 +16,7 @@
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:p="http://primefaces.org/ui">
+    <!--@elvariable id="item" type="org.kitodo.production.dto.DocketDTO"-->
     <p:dataTable id="docketTable"
                  styleClass="default-layout"
                  var="item"
@@ -25,6 +26,7 @@
                  paginator="true"
                  resizableColumns="true"
                  liveResize="true"
+                 sortBy="#{item.title.keyword}"
                  rows="#{LoginForm.loggedUser.tableSize}"
                  paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                  currentPageReportTemplate="#{msgs.currentPageReportTemplate}"
@@ -34,7 +36,7 @@
                 listener="#{DocketForm.onPageChange}"/>
 
         <p:column headerText="#{msgs.title}"
-                  sortBy="#{item.title}"
+                  sortBy="#{item.title.keyword}"
                   rendered="#{ProjectForm.showColumn('docket.title')}">
             <h:outputText value="#{item.title}"
                           title="#{item.title}"/>
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/projectList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/projectList.xhtml
index e715c84860d..bd9eda0d1cf 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/projectList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/projectList.xhtml
@@ -16,6 +16,7 @@
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:p="http://primefaces.org/ui">
+    <!--@elvariable id="item" type="org.kitodo.production.dto.ProjectDTO"-->
     <p:dataTable var="item"
                  value="#{ProjectForm.lazyDTOModel}"
                  first="#{ProjectForm.firstRow}"
@@ -25,6 +26,7 @@
                  paginator="true"
                  resizableColumns="true"
                  liveResize="true"
+                 sortBy="#{item.title.keyword}"
                  rows="#{LoginForm.loggedUser.tableSize}"
                  paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                  currentPageReportTemplate="#{msgs.currentPageReportTemplate}"
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/rulesetList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/rulesetList.xhtml
index b4a51cdba0b..66ef6bc4a29 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/rulesetList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/rulesetList.xhtml
@@ -16,6 +16,7 @@
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:p="http://primefaces.org/ui">
+    <!--@elvariable id="item" type="org.kitodo.production.dto.RulesetDTO"-->
     <p:dataTable id="rulesetTable"
                  styleClass="default-layout"
                  var="item"
@@ -25,6 +26,7 @@
                  paginator="true"
                  resizableColumns="true"
                  liveResize="true"
+                 sortBy="#{item.title.keyword}"
                  rows="#{LoginForm.loggedUser.tableSize}"
                  paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                  currentPageReportTemplate="#{msgs.currentPageReportTemplate}"
@@ -34,7 +36,7 @@
                 listener="#{RulesetForm.onPageChange}"/>
 
         <p:column headerText="#{msgs.title}"
-                  sortBy="#{item.title}"
+                  sortBy="#{item.title.keyword}"
                   rendered="#{ProjectForm.showColumn('ruleset.title')}">
             <h:outputText value="#{item.title}"
                           title="#{item.title}"/>
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/templateList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/templateList.xhtml
index efb8efc249c..31d1903ff4d 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/templateList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/templateList.xhtml
@@ -17,6 +17,7 @@
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:o="http://omnifaces.org/ui"
         xmlns:p="http://primefaces.org/ui">
+    <!--@elvariable id="item" type="org.kitodo.production.dto.TemplateDTO"-->
     <p:dataTable id="templateTable"
                  styleClass="default-layout"
                  var="item"
@@ -26,6 +27,7 @@
                  paginator="true"
                  resizableColumns="true"
                  liveResize="true"
+                 sortBy="#{item.title.keyword}"
                  rows="#{LoginForm.loggedUser.tableSize}"
                  paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                  currentPageReportTemplate="#{msgs.currentPageReportTemplate}"
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/workflowList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/workflowList.xhtml
index adcace3a957..045ce4db42f 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/workflowList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/projects/workflowList.xhtml
@@ -16,6 +16,7 @@
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:p="http://primefaces.org/ui">
+    <!--@elvariable id="item" type="org.kitodo.production.dto.WorkflowDTO"-->
     <p:dataTable id="workflowTable"
                  styleClass="default-layout"
                  var="item"
@@ -25,6 +26,7 @@
                  paginator="true"
                  resizableColumns="true"
                  liveResize="true"
+                 sortBy="#{item.title.keyword}"
                  rows="#{LoginForm.loggedUser.tableSize}"
                  paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                  currentPageReportTemplate="#{msgs.currentPageReportTemplate}"
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/taskList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/taskList.xhtml
index 14bc7098e8e..76b08382a5f 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/taskList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/tasks/taskList.xhtml
@@ -19,6 +19,7 @@
         xmlns:p="http://primefaces.org/ui">
     <p:importEnum type="org.kitodo.data.database.enums.TaskStatus" allSuffix="ALL_ENUM_VALUES"/>
     <h:form id="tasksForm">
+        <!--@elvariable id="item" type="org.kitodo.production.dto.TaskDTO"-->
         <p:dataTable id="taskTable"
                      widgetVar="taskTable"
                      var="item"
@@ -29,6 +30,7 @@
                      paginator="true"
                      resizableColumns="true"
                      liveResize="true"
+                     sortBy="#{item.title.keyword}"
                      rows="#{LoginForm.loggedUser.tableSize}"
                      paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                      currentPageReportTemplate="#{msgs.currentPageReportTemplate}"
@@ -45,7 +47,7 @@
             </p:column>
 
             <p:column id="titleColumn"
-                      headerText="#{msgs.task}"
+                      headerText="#{msgs.title}"
                       sortBy="#{item.title.keyword}"
                       rendered="#{CurrentTaskForm.showColumn('task.title')}">
                 <h:outputText title="#{item.title}"
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/clientList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/clientList.xhtml
index 5448d1f1f20..d30482228c4 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/clientList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/clientList.xhtml
@@ -14,6 +14,7 @@
     xmlns:f="http://xmlns.jcp.org/jsf/core"
     xmlns:h="http://xmlns.jcp.org/jsf/html"
     xmlns:p="http://primefaces.org/ui">
+    <!--@elvariable id="item" type="org.kitodo.production.dto.ClientDTO"-->
     <p:dataTable var="item"
                  id="clientsTable"
                  styleClass="default-layout"
@@ -23,6 +24,7 @@
                  paginator="true"
                  resizableColumns="true"
                  liveResize="true"
+                 sortBy="#{item.name}"
                  rows="#{LoginForm.loggedUser.tableSize}"
                  paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                  currentPageReportTemplate="#{msgs.currentPageReportTemplate}"
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/ldapgroupList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/ldapgroupList.xhtml
index e3b42a627c5..a088330a821 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/ldapgroupList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/ldapgroupList.xhtml
@@ -16,6 +16,7 @@
     xmlns:f="http://xmlns.jcp.org/jsf/core"
     xmlns:h="http://xmlns.jcp.org/jsf/html"
     xmlns:p="http://primefaces.org/ui">
+    <!--@elvariable id="item" type="org.kitodo.data.database.beans.LdapGroup"-->
     <p:dataTable var="item"
                  id="ldapGroupsTable"
                  styleClass="default-layout"
@@ -25,6 +26,7 @@
                  paginator="true"
                  resizableColumns="true"
                  liveResize="true"
+                 sortBy="#{item.title}"
                  rows="#{LoginForm.loggedUser.tableSize}"
                  paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                  currentPageReportTemplate="#{msgs.currentPageReportTemplate}"
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/ldapserverList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/ldapserverList.xhtml
index 2f52718dc4b..04009b53bd8 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/ldapserverList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/ldapserverList.xhtml
@@ -14,6 +14,7 @@
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:p="http://primefaces.org/ui">
+    <!--@elvariable id="item" type="org.kitodo.data.database.beans.LdapServer"-->
     <p:dataTable var="item"
                  id="ldapServersTable"
                  styleClass="default-layout"
@@ -23,6 +24,7 @@
                  paginator="true"
                  resizableColumns="true"
                  liveResize="true"
+                 sortBy="#{item.title}">
                  rows="#{LoginForm.loggedUser.tableSize}"
                  paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                  currentPageReportTemplate="#{msgs.currentPageReportTemplate}"
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/roleList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/roleList.xhtml
index 9bee22ade21..af39fb42d16 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/roleList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/roleList.xhtml
@@ -16,6 +16,7 @@
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:p="http://primefaces.org/ui">
+    <!--@elvariable id="item" type="org.kitodo.production.dto.RoleDTO"-->
     <p:dataTable var="item"
                  id="rolesTable"
                  styleClass="default-layout"
@@ -25,6 +26,7 @@
                  paginator="true"
                  resizableColumns="true"
                  liveResize="true"
+                 sortBy="#{item.title}"
                  rows="#{LoginForm.loggedUser.tableSize}"
                  paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                  currentPageReportTemplate="#{msgs.currentPageReportTemplate}"
diff --git a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/userList.xhtml b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/userList.xhtml
index f8b29a5917c..d786a5b28e7 100644
--- a/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/userList.xhtml
+++ b/Kitodo/src/main/webapp/WEB-INF/templates/includes/users/userList.xhtml
@@ -16,6 +16,7 @@
         xmlns:f="http://xmlns.jcp.org/jsf/core"
         xmlns:h="http://xmlns.jcp.org/jsf/html"
         xmlns:p="http://primefaces.org/ui">
+    <!--@elvariable id="item" type="org.kitodo.production.dto.UserDTO"-->
     <p:dataTable var="item"
                  id="usersTable"
                  widgetVar="usersTable"
@@ -26,6 +27,7 @@
                  paginator="true"
                  resizableColumns="true"
                  liveResize="true"
+                 sortBy="#{item.surname}"
                  rows="#{LoginForm.loggedUser.tableSize}"
                  paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {NextPageLink} {LastPageLink}"
                  currentPageReportTemplate="#{msgs.currentPageReportTemplate}"

From b88a40195fca1070d57099b8fcbbde3b864300e8 Mon Sep 17 00:00:00 2001
From: Arved Solth <solth@effective-webwork.de>
Date: Tue, 23 Feb 2021 10:23:02 +0100
Subject: [PATCH 2/2] Adjust Selenium test

---
 Kitodo/src/test/java/org/kitodo/selenium/EditingST.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Kitodo/src/test/java/org/kitodo/selenium/EditingST.java b/Kitodo/src/test/java/org/kitodo/selenium/EditingST.java
index 5ceb6ebf55d..7015a344821 100644
--- a/Kitodo/src/test/java/org/kitodo/selenium/EditingST.java
+++ b/Kitodo/src/test/java/org/kitodo/selenium/EditingST.java
@@ -163,7 +163,7 @@ public void editRulesetTest() throws Exception {
     @Test
     public void editUserTest() throws Exception {
         usersPage.editUser();
-        assertEquals("Header for edit user is incorrect", "Benutzer bearbeiten (Kowalski, Jan)",
+        assertEquals("Header for edit user is incorrect", "Benutzer bearbeiten (null, Removable user)",
             Pages.getUserEditPage().getHeaderText());
     }