comparison: src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt
src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt
- changeset 307
- 23fe9f174d2d
- parent 306
- 1ab9f65e683e
- child 311
- bf67e0ff7131
equal
deleted
inserted
replaced
| 306:1ab9f65e683e | 307:23fe9f174d2d |
|---|---|
| 113 .sortedWith(IssueSorter(filter.sortPrimary, filter.sortSecondary, filter.sortTertiary)) | 113 .sortedWith(IssueSorter(filter.sortPrimary, filter.sortSecondary, filter.sortTertiary)) |
| 114 .filter { | 114 .filter { |
| 115 (!filter.onlyMine || (it.assignee?.username ?: "") == (http.remoteUser ?: "<Anonymous>")) && | 115 (!filter.onlyMine || (it.assignee?.username ?: "") == (http.remoteUser ?: "<Anonymous>")) && |
| 116 (!filter.onlyBlocker || (relationsMap[it.id]?.any { (_,type) -> type.blocking }?:false)) && | 116 (!filter.onlyBlocker || (relationsMap[it.id]?.any { (_,type) -> type.blocking }?:false)) && |
| 117 (filter.status.isEmpty() || filter.status.contains(it.status)) && | 117 (filter.status.isEmpty() || filter.status.contains(it.status)) && |
| 118 (filter.category.isEmpty() || filter.category.contains(it.category)) | 118 (filter.category.isEmpty() || filter.category.contains(it.category)) && |
| 119 (filter.onlyMine || filter.assignee.isEmpty() || filter.assignee.contains(it.assignee?.id ?: -1)) | |
| 119 } | 120 } |
| 120 | 121 |
| 121 with(http) { | 122 with(http) { |
| 122 pageTitle = project.name | 123 pageTitle = project.name |
| 123 view = ProjectDetails(path, issues, filter) | 124 view = ProjectDetails(path, issues, filter, dao.listUsers().sortedBy(User::shortDisplayname)) |
| 124 feedPath = feedPath(project) | 125 feedPath = feedPath(project) |
| 125 navigationMenu = projectNavMenu(dao.listProjects(), path) | 126 navigationMenu = projectNavMenu(dao.listProjects(), path) |
| 126 styleSheets = listOf("projects") | 127 styleSheets = listOf("projects") |
| 127 javascript = "project-details" | 128 javascript = "project-details" |
| 128 render("project-details") | 129 render("project-details") |
