comparison: src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java
src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java
- changeset 161
- 3d9218457b62
- parent 159
- 86b5d8a1662f
- child 162
- 2adc8623dd89
equal
deleted
inserted
replaced
| 160:e2d09cf3fb96 | 161:3d9218457b62 |
|---|---|
| 93 info.setIssueSummary(projectDao.getIssueSummary(project)); | 93 info.setIssueSummary(projectDao.getIssueSummary(project)); |
| 94 viewModel.setProjectInfo(info); | 94 viewModel.setProjectInfo(info); |
| 95 | 95 |
| 96 // Select Version | 96 // Select Version |
| 97 final var versionNode = pathParameters.get("version"); | 97 final var versionNode = pathParameters.get("version"); |
| 98 if ("no-version".equals(versionNode)) { | 98 if (versionNode != null) { |
| 99 viewModel.setVersionFilter(ProjectView.NO_VERSION); | 99 if ("no-version".equals(versionNode)) { |
| 100 } else if ("all-versions".equals(versionNode) || versionNode == null) { | 100 viewModel.setVersionFilter(ProjectView.NO_VERSION); |
| 101 viewModel.setVersionFilter(ProjectView.ALL_VERSIONS); | 101 } else if ("all-versions".equals(versionNode)) { |
| 102 } else { | 102 viewModel.setVersionFilter(ProjectView.ALL_VERSIONS); |
| 103 viewModel.setVersionFilter(versionDao.findByNode(project, versionNode)); | 103 } else { |
| 104 viewModel.setVersionFilter(versionDao.findByNode(project, versionNode)); | |
| 105 } | |
| 104 } | 106 } |
| 105 | 107 |
| 106 // Select Component | 108 // Select Component |
| 107 final var componentNode = pathParameters.get("component"); | 109 final var componentNode = pathParameters.get("component"); |
| 108 if ("no-component".equals(componentNode)) { | 110 if (componentNode != null) { |
| 109 viewModel.setComponentFilter(ProjectView.NO_COMPONENT); | 111 if ("no-component".equals(componentNode)) { |
| 110 } else if ("all-components".equals(componentNode) || componentNode == null) { | 112 viewModel.setComponentFilter(ProjectView.NO_COMPONENT); |
| 111 viewModel.setComponentFilter(ProjectView.ALL_COMPONENTS); | 113 } else if ("all-components".equals(componentNode)) { |
| 112 } else { | 114 viewModel.setComponentFilter(ProjectView.ALL_COMPONENTS); |
| 113 viewModel.setComponentFilter(componentDao.findByNode(project, componentNode)); | 115 } else { |
| 116 viewModel.setComponentFilter(componentDao.findByNode(project, componentNode)); | |
| 117 } | |
| 114 } | 118 } |
| 115 } | 119 } |
| 116 | 120 |
| 117 private static String sanitizeNode(String node, String defaultValue) { | 121 private static String sanitizeNode(String node, String defaultValue) { |
| 118 String result = node == null || node.isBlank() ? defaultValue : node; | 122 String result = node == null || node.isBlank() ? defaultValue : node; |
