#14 Add merge summary in to the open cases list

TheHive-Project · Nov 21, 2016 · e994a8b · e994a8b
1 parent cfd3845
commit e994a8b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/ui/app/styles/case.css b/ui/app/styles/case.css
@@ -23,6 +23,10 @@ span.link-id {
     text-align: center;
 }
 
+.merge-hints {
+    padding-left: 35px;
+}
+
 .indicent-header h2.background {
     position: relative;
     z-index: 1;

diff --git a/ui/app/views/partials/index-closedcases.html b/ui/app/views/partials/index-closedcases.html
@@ -14,8 +14,8 @@
 			<td>
 				<tlp value="closedCase.tlp"></tlp>
 				<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})"> case #{{closedCase.stats.mergeInto.caseId}}</a></small>					
+				<div class="merge-hints text-danger" ng-if="closedCase.mergeInto">
+					<small>Merged into <a href ui-sref="app.case.details({caseId: closedCase.mergedInto})"> Case #{{closedCase.stats.mergeInto.caseId}}</a></small>					
 				</div>
 			</td>
 			<td>

diff --git a/ui/app/views/partials/index-currentcases.html b/ui/app/views/partials/index-currentcases.html
@@ -16,6 +16,12 @@
                 <a ui-sref="app.case.details({caseId: currentCase.id})">#{{currentCase.caseId}}
                     -
                     {{currentCase.title}}</a>
+                <div class="merge-hints text-danger" ng-if="currentCase.mergeFrom">
+					<small>
+                        Merged from <a href ui-sref="app.case.details({caseId: currentCase.mergeFrom[0]})"> Case #{{currentCase.stats.mergeFrom[0].caseId}}</a> and
+                        <a href ui-sref="app.case.details({caseId: currentCase.mergeFrom[1]})"> Case #{{currentCase.stats.mergeFrom[1].caseId}}</a>
+                    </small>					
+				</div>
             </td>
             <td>
                 <span ng-repeat="tag in currentCase.tags">