#14 Add visual hints indicating that a case has been closed as duplicate

TheHive-Project · Nov 18, 2016 · 14d5147 · 14d5147
1 parent 1dc88a3
commit 14d5147
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/ui/app/scripts/services/Constants.js b/ui/app/scripts/services/Constants.js
@@ -5,6 +5,7 @@
             Indeterminate: 'Indeterminate',
             FalsePositive: 'False Positive',
             TruePositive: 'True Positive',
+            Duplicated: 'Duplicated',
             Other: 'Other'
         })
         .value('CaseImpactStatus', {

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
@@ -57,6 +57,10 @@ <h4>
                     </strong>
                 </span>
             </div>
-        </div>
+        </div>        
     </div>
 </div>
+
+<div class="alert alert-warning text-center" ng-show="caze.mergeInto">
+    <h4 class="mb-0">This case has been closed as <em>Duplicated</em> and merged into <a href ui-sref="app.case.details({caseId: caze.mergeInto})">the following case</a></h4> 
+</div>
diff --git a/ui/app/views/partials/index-closedcases.html b/ui/app/views/partials/index-closedcases.html
@@ -13,7 +13,10 @@
 		<tr ng-repeat="closedCase in list.values">
 			<td>
 				<tlp value="closedCase.tlp"></tlp>
-				<a ui-sref="app.case.details({caseId: closedCase.id})">#{{closedCase.caseId}} - {{closedCase.title}}</a>
+				<a ui-sref="app.case.details({caseId: closedCase.id})">#{{closedCase.caseId}} - {{closedCase.title}}</a>				
+				<div class="text-danger" ng-if="closedCase.mergeInto">
+					<small>Merged into <a href ui-sref="app.case.details({caseId: closedCase.mergedInto})">the following case</a></small>					
+				</div>
 			</td>
 			<td>
                 <span ng-repeat="tag in closedCase.tags">