add clearing state to release details - linked releases page

* closes #177
sw360 · Sep 29, 2016 · 3de54dd · 3de54dd
1 parent 8d5044e
commit 3de54dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/...d/src-common/src/main/java/com/siemens/sw360/datahandler/db/ComponentDatabaseHandler.java b/...d/src-common/src/main/java/com/siemens/sw360/datahandler/db/ComponentDatabaseHandler.java
@@ -9,7 +9,6 @@
  */
 package com.siemens.sw360.datahandler.db;
 
-import com.google.common.base.Strings;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.siemens.sw360.components.summary.SummaryType;
@@ -45,9 +44,7 @@
 
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.collect.Sets.newHashSet;
-import static com.siemens.sw360.datahandler.common.CommonUtils.getBestClearingReport;
-import static com.siemens.sw360.datahandler.common.CommonUtils.isInProgressOrPending;
-import static com.siemens.sw360.datahandler.common.CommonUtils.nullToEmptySet;
+import static com.siemens.sw360.datahandler.common.CommonUtils.*;
 import static com.siemens.sw360.datahandler.common.Duration.durationOf;
 import static com.siemens.sw360.datahandler.common.SW360Assert.assertNotNull;
 import static com.siemens.sw360.datahandler.common.SW360Assert.fail;
@@ -688,7 +685,9 @@ private ReleaseLink getReleaseLink(Release release) {
             final Vendor vendor = vendorRepository.get(release.getVendorId());
             fullname = vendor != null ? vendor.getFullname() : "";
         }
-        return new ReleaseLink(release.id, fullname, release.name, release.version);
+        ReleaseLink releaseLink = new ReleaseLink(release.id, fullname, release.name, release.version);
+        releaseLink.setClearingState(release.getClearingState());
+        return releaseLink;
     }
 
     public List<Release> searchReleaseByName(String name) {

diff --git a/frontend/sw360-portlet/src/main/webapp/html/utils/includes/linkedReleaseDetails.jspf b/frontend/sw360-portlet/src/main/webapp/html/utils/includes/linkedReleaseDetails.jspf
@@ -24,14 +24,15 @@
 <table class="table info_table" id="LinkedReleasesInfo" title="Linked Releases Hierarchy">
     <thead>
     <tr>
-        <th colspan="5" class="headlabel">Linked Releases Hierarchy</th>
+        <th colspan="6" class="headlabel">Linked Releases Hierarchy</th>
     </tr>
     <tr>
         <th>Release name</th>
         <th>Vendor</th>
         <th>Release version</th>
         <th>Release relation</th>
         <th>License names</th>
+        <th>Clearing state</th>
     </tr>
     </thead>
     <tbody>
@@ -65,12 +66,15 @@
                                                    scopeGroupId="${pageContext.getAttribute('scopeGroupId')}"/>
                 </core_rt:if>
             </td>
+            <td>
+                <sw360:DisplayEnum value="${releaseLink.clearingState}"/>
+            </td>
         </tr>
     </core_rt:forEach>
 
     <core_rt:if test="${releaseList.size() < 1}">
         <tr>
-            <td colspan="5"> No linked releases</td>
+            <td colspan="6"> No linked releases</td>
         </tr>
     </core_rt:if>
 

diff --git a/libraries/lib-datahandler/src/main/thrift/components.thrift b/libraries/lib-datahandler/src/main/thrift/components.thrift
@@ -274,6 +274,7 @@ struct ReleaseLink{
     20: optional string parentId,
     21: optional list<ReleaseLink> subreleases,
 
+    31: optional ClearingState clearingState,
     100: optional set<string> licenseIds,
     101: optional set<string> licenseNames
 }