Mercurial > hg > LightPIT / file diff

--- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java	Sat Aug 29 16:48:15 2020 +0200
+++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java	Sat Aug 29 17:13:09 2020 +0200
@@ -43,7 +43,6 @@
 import java.sql.Date;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -112,7 +111,7 @@
                 final var level2 = new ArrayList<MenuEntry>();
                 {
                     final var entry = new MenuEntry(
-                            new ResourceKey(getResourceBundleName(), "filter.all"),
+                            new ResourceKey(getResourceBundleName(), "filter.none"),
                             "projects/view?" + queryParams(proj, null)
                     );
                     if (viewModel.getVersionFilter() == null) entry.setActive(true);
@@ -257,17 +256,12 @@
 
         final var issueDao = dao.getIssueDao();
 
-        final var project = viewModel.getProjectInfo().getProject();
+        final var version = viewModel.getVersionFilter();
 
         final var detailView = viewModel.getProjectDetails();
-        final var issues = issueDao.list(project);
+        final var issues = issueDao.list(version);
         for (var issue : issues) issueDao.joinVersionInformation(issue);
-        detailView.setIssues(issues);
-        if (viewModel.getVersionFilter() != null) {
-            detailView.updateVersionInfo(List.of(viewModel.getVersionFilter()));
-        } else {
-            detailView.updateVersionInfo(viewModel.getProjectInfo().getVersions());
-        }
+        detailView.updateDetails(issues, version);
 
         return forwardView(req, viewModel, "project-details");
     }