Merge pull request #1524 from siemens/fix/OpenComponentsCount

fix(CR-UI): fixed the count mismatch in Open Components column of CR table Reviewed by: anupam.ghosh@siemens.com Tested by: anupam.ghosh@siemens.com
eclipse-sw360 · May 20, 2022 · 2a1f3c9 · 2a1f3c9
2 parents 2223104 + bafd477
commit 2a1f3c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/moderation/view.jsp
@@ -790,7 +790,7 @@ AUI().use('liferay-portlet-url', function () {
                         projCell.data(renderLinkToProject(response[i].id, projName));
                         if (isOpenCrTable) {
                             let clearing = response[i].clearing,
-                                totalCount = d(clearing.newRelease) + d(clearing.underClearing) + d(clearing.sentToClearingTool) + d(clearing.reportAvailable) + d(clearing.approved),
+                                totalCount = d(clearing.newRelease) + d(clearing.underClearing) + d(clearing.sentToClearingTool) + d(clearing.reportAvailable) + d(clearing.approved) + d(clearing.scanAvailable),
                                 approvedCount = d(clearing.reportAvailable) + d(clearing.approved);
                             compCell.data(totalCount - approvedCount);
                             if (!totalCount || $(table.cell('#'+crId, 4).node()).find('span.sw360-tt-ClearingRequestState-NEW').text()) {

diff --git a/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/view.jsp b/frontend/sw360-portlet/src/main/resources/META-INF/resources/html/projects/view.jsp
@@ -523,7 +523,7 @@
                     approvedCount;
 
                 if (clearing) {
-                    releaseCount = d(clearing.newRelease) + d(clearing.underClearing) + d(clearing.sentToClearingTool) + d(clearing.reportAvailable) + d(clearing.approved);
+                    releaseCount = d(clearing.newRelease) + d(clearing.underClearing) + d(clearing.sentToClearingTool) + d(clearing.reportAvailable) + d(clearing.approved) + d(clearing.scanAvailable);
                     approvedCount = d(clearing.approved);
                     resultElementAsString = "<span class=\"clearingstate content-center\" title=\"" + approvedCount + (approvedCount === 1 ? " <liferay-ui:message key='release' />" : " <liferay-ui:message key='releases' />")
                         + " <liferay-ui:message key='out.of' /> " + releaseCount + (approvedCount === 1 ? " <liferay-ui:message key='has' />" : " <liferay-ui:message key='have' />")