Wed, 25 Nov 2020 11:17:39 +0100
temporarily fixes version and component filter settings
src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java | file | annotate | diff | comparison | revisions |
1.1 --- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Wed Nov 25 11:13:02 2020 +0100 1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Wed Nov 25 11:17:39 2020 +0100 1.3 @@ -95,22 +95,26 @@ 1.4 1.5 // Select Version 1.6 final var versionNode = pathParameters.get("version"); 1.7 - if ("no-version".equals(versionNode)) { 1.8 - viewModel.setVersionFilter(ProjectView.NO_VERSION); 1.9 - } else if ("all-versions".equals(versionNode) || versionNode == null) { 1.10 - viewModel.setVersionFilter(ProjectView.ALL_VERSIONS); 1.11 - } else { 1.12 - viewModel.setVersionFilter(versionDao.findByNode(project, versionNode)); 1.13 + if (versionNode != null) { 1.14 + if ("no-version".equals(versionNode)) { 1.15 + viewModel.setVersionFilter(ProjectView.NO_VERSION); 1.16 + } else if ("all-versions".equals(versionNode)) { 1.17 + viewModel.setVersionFilter(ProjectView.ALL_VERSIONS); 1.18 + } else { 1.19 + viewModel.setVersionFilter(versionDao.findByNode(project, versionNode)); 1.20 + } 1.21 } 1.22 1.23 // Select Component 1.24 final var componentNode = pathParameters.get("component"); 1.25 - if ("no-component".equals(componentNode)) { 1.26 - viewModel.setComponentFilter(ProjectView.NO_COMPONENT); 1.27 - } else if ("all-components".equals(componentNode) || componentNode == null) { 1.28 - viewModel.setComponentFilter(ProjectView.ALL_COMPONENTS); 1.29 - } else { 1.30 - viewModel.setComponentFilter(componentDao.findByNode(project, componentNode)); 1.31 + if (componentNode != null) { 1.32 + if ("no-component".equals(componentNode)) { 1.33 + viewModel.setComponentFilter(ProjectView.NO_COMPONENT); 1.34 + } else if ("all-components".equals(componentNode)) { 1.35 + viewModel.setComponentFilter(ProjectView.ALL_COMPONENTS); 1.36 + } else { 1.37 + viewModel.setComponentFilter(componentDao.findByNode(project, componentNode)); 1.38 + } 1.39 } 1.40 } 1.41