fix(moderation): set all using project count to merge pages

sw360 · Apr 9, 2018 · e944e3f · e944e3f
1 parent a183488
commit e944e3f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationPortlet.java b/...portlet/src/main/java/org/eclipse/sw360/portal/portlets/moderation/ModerationPortlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright Siemens AG, 2013-2017. Part of the SW360 Portal Project.
+ * Copyright Siemens AG, 2013-2018. Part of the SW360 Portal Project.
  *
  * SPDX-License-Identifier: EPL-1.0
  *
@@ -399,18 +399,21 @@ private void prepareComponent(RenderRequest request, User user, Component actual
         Set<String> releaseIds = SW360Utils.getReleaseIds(releases);
 
         Set<Project> usingProjects = null;
+        int allUsingProjectsCount = 0;
 
         if (releaseIds != null && releaseIds.size() > 0) {
             try {
                 ProjectService.Iface projectClient = thriftClients.makeProjectClient();
                 usingProjects = projectClient.searchByReleaseIds(releaseIds, user);
+                allUsingProjectsCount = projectClient.getCountByReleaseIds(releaseIds);
             } catch (TException e) {
                 log.error("Could not retrieve using projects", e);
             }
         }
         request.setAttribute(DOCUMENT_TYPE, SW360Constants.TYPE_COMPONENT);
         setAttachmentsInRequest(request, actualComponent.getAttachments());
         request.setAttribute(USING_PROJECTS, nullToEmptySet(usingProjects));
+        request.setAttribute(ALL_USING_PROJECTS_COUNT, allUsingProjectsCount);
     }
 
     public void renderReleaseModeration(RenderRequest request, RenderResponse response, ModerationRequest moderationRequest, User user) throws IOException, PortletException, TException {
@@ -464,6 +467,8 @@ private void prepareRelease(RenderRequest request, User user, Release actualRele
             ProjectService.Iface projectClient = thriftClients.makeProjectClient();
             Set<Project> usingProjects = projectClient.searchByReleaseId(actualReleaseId, user);
             request.setAttribute(USING_PROJECTS, nullToEmptySet(usingProjects));
+            int allUsingProjectsCount = projectClient.getCountByReleaseIds(Collections.singleton(actualReleaseId));
+            request.setAttribute(ALL_USING_PROJECTS_COUNT, allUsingProjectsCount);
             putDirectlyLinkedReleaseRelationsInRequest(request, actualRelease);
         } catch (TException e) {
             log.error("Could not retrieve using projects", e);
@@ -517,6 +522,8 @@ private void prepareProject(RenderRequest request, User user, Project actual_pro
             putDirectlyLinkedReleasesInRequest(request, actual_project);
             Set<Project> usingProjects = client.searchLinkingProjects(actual_project.getId(), user);
             request.setAttribute(USING_PROJECTS, usingProjects);
+            int allUsingProjectsCount = client.getCountByProjectId(actual_project.getId());
+            request.setAttribute(ALL_USING_PROJECTS_COUNT, allUsingProjectsCount);
             putReleasesAndProjectIntoRequest(request, actual_project.getId(), user);
             request.setAttribute(DOCUMENT_TYPE, SW360Constants.TYPE_PROJECT);
             setAttachmentsInRequest(request, actual_project.getAttachments());

diff --git a/frontend/sw360-portlet/src/main/webapp/html/components/editRelease.jsp b/frontend/sw360-portlet/src/main/webapp/html/components/editRelease.jsp
@@ -48,7 +48,7 @@
 
     <jsp:useBean id="usingProjects" type="java.util.Set<org.eclipse.sw360.datahandler.thrift.projects.Project>"
                  scope="request"/>
-
+    <jsp:useBean id="allUsingProjectsCount" type="java.lang.Integer" scope="request"/>
     <jsp:useBean id="usingComponents" type="java.util.Set<org.eclipse.sw360.datahandler.thrift.components.Component>" scope="request"/>
 
     <core_rt:set var="programmingLanguages" value='<%=PortalConstants.PROGRAMMING_LANGUAGES%>'/>