Mercurial > hg > LightPIT / file diff

--- a/src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt	Sun Jan 08 17:57:05 2023 +0100
+++ b/src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt	Sun Jan 08 19:32:11 2023 +0100
@@ -191,13 +191,7 @@
             val relationsMap = if (needRelationsMap) dao.getIssueRelationMap(project, filter.includeDone) else emptyMap()
 
             val issues = dao.listIssues(project, filter.includeDone, version, component)
-                .sortedWith(
-                    IssueSorter(
-                        IssueSorter.Criteria(IssueSorter.Field.DONE),
-                        IssueSorter.Criteria(IssueSorter.Field.ETA),
-                        IssueSorter.Criteria(IssueSorter.Field.UPDATED, false)
-                    )
-                )
+                .sortedWith(IssueSorter(filter.sortPrimary, filter.sortSecondary, filter.sortTertiary))
                 .filter {
                     (!filter.onlyMine || (it.assignee?.username ?: "") == (http.remoteUser ?: "<Anonymous>")) &&
                     (!filter.onlyBlocker || (relationsMap[it.id]?.any { (_,type) -> type.blocking }?:false)) &&