Sat, 05 Jun 2021 09:04:13 +0200
fixes project creation not working
src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt | file | annotate | diff | comparison | revisions |
1.1 --- a/src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt Sat May 15 16:19:29 2021 +0200 1.2 +++ b/src/main/kotlin/de/uapcore/lightpit/servlet/ProjectServlet.kt Sat Jun 05 09:04:13 2021 +0200 1.3 @@ -210,21 +210,23 @@ 1.4 } 1.5 1.6 private fun projectForm(http: HttpRequest, dao: DataAccessObject) { 1.7 - val projectInfo = obtainProjectInfo(http, dao) 1.8 - if (projectInfo == null) { 1.9 - http.response.sendError(404) 1.10 - return 1.11 - } 1.12 - 1.13 - with(http) { 1.14 - view = ProjectEditView(projectInfo.project, dao.listUsers()) 1.15 - navigationMenu = activeProjectNavMenu( 1.16 + if (!http.pathParams.containsKey("project")) { 1.17 + http.view = ProjectEditView(Project(-1), dao.listUsers()) 1.18 + http.navigationMenu = projectNavMenu(dao.listProjects()) 1.19 + } else { 1.20 + val projectInfo = obtainProjectInfo(http, dao) 1.21 + if (projectInfo == null) { 1.22 + http.response.sendError(404) 1.23 + return 1.24 + } 1.25 + http.view = ProjectEditView(projectInfo.project, dao.listUsers()) 1.26 + http.navigationMenu = activeProjectNavMenu( 1.27 dao.listProjects(), 1.28 projectInfo 1.29 ) 1.30 - styleSheets = listOf("projects") 1.31 - render("project-form") 1.32 } 1.33 + http.styleSheets = listOf("projects") 1.34 + http.render("project-form") 1.35 } 1.36 1.37 private fun projectCommit(http: HttpRequest, dao: DataAccessObject) {