#14 display merged case title, in case details page for cases closed …

…as duplicate
TheHive-Project · Nov 18, 2016 · 95c34e7 · 95c34e7
1 parent 87f0c4b
commit 95c34e7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js
@@ -130,7 +130,8 @@ angular.module('thehive', ['ngAnimate', 'ngMessages', 'ui.bootstrap', 'ui.router
                         var deferred = $q.defer();
 
                         CaseSrv.get({
-                            'caseId': $stateParams.caseId
+                            'caseId': $stateParams.caseId,
+                            'nstats': true
                         }, function(data) {
 
                             deferred.resolve(data);

diff --git a/ui/app/views/partials/case/case.panelinfo.html b/ui/app/views/partials/case/case.panelinfo.html
@@ -14,18 +14,18 @@ <h4>
                                 <i class="text-primary fa fa-2x fa-compress"></i>
                             </a>
                         </span>
-                        <span class="ml-xs">
+                    <span class="ml-xs">
                             <a href ng-click="switchFlag()" class="noline" tooltip="{{caze.flag ? 'Unflag case' :  'Flag case'}}">
                                 <i class="text-yellow fa fa-2x fa-flag" ng-show="caze.flag"></i>
                                 <i class="text-muted fa fa-2x fa-flag" ng-class="setFlag" ng-mouseout="setFlag='text-muted'" ng-mouseover="setFlag='text-yellow'" ng-show="!caze.flag || caze.flag == undefined"></i>
                             </a>
                         </span>
-                        <span class="ml-xs" ng-hide="isCaseClosed()">
+                    <span class="ml-xs" ng-hide="isCaseClosed()">
                             <a href ng-click="openCloseDialog()" class="noline" tooltip="Close case">
                                 <i class="text-muted fa fa-2x fa-check-circle-o" ng-class="CloseCase" ng-mouseout="CloseCase='text-muted glyphicon-ok-circle'" ng-mouseover="CloseCase='text-success glyphicon-ok-sign'"></i>
                             </a>
                         </span>
-                        <span class="ml-xs" ng-show="isCaseClosed()">
+                    <span class="ml-xs" ng-show="isCaseClosed()">
                             <a href ng-click="reopenCase()" class="noline" tooltip="Reopen case">
                                 <i class="text-success fa fa-2x fa-check-circle"></i>
                             </a>
@@ -40,27 +40,27 @@ <h4>
                     <i class="glyphicon glyphicon-user"></i>
                     <span ng-bind="getUserInfo(caze.user) | getField: 'name'"></span>
                 </span>
-
                 <span class="ml-xxs">
                     <i class="glyphicon glyphicon-calendar"></i>
                     <span>{{caze.startDate | showDate}}</span>&nbsp;&nbsp;
-                    <span ng-show="isCaseClosed()" class="text-success">(Closed at
+                <span ng-show="isCaseClosed()" class="text-success">(Closed at
                         {{caze.endDate | showDate}}
                         as
                         <strong>{{CaseResolutionStatus[caze.resolutionStatus]}}</strong>)</span>
                 </span>
-
                 <span class="ml-xxs text-danger" ng-show="links.length > 0">
                     <i class="glyphicon glyphicon-link"></i>
                     <strong>
                         <ng-pluralize count="links.length" when="{'one': '1 Related case', 'other': '{} Related cases'}"></ng-pluralize>
                     </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> 
+    <h4 class="mb-0">
+        This case has been closed as a duplicate and merged into <br>
+        <div class="mt-xs text-primary"><a href ui-sref="app.case.details({caseId: caze.mergeInto})">Case #{{caze.stats.mergeInto.caseId}}: {{caze.stats.mergeInto.title}}</a></div>
+    </h4>
 </div>
diff --git a/ui/app/views/partials/index-closedcases.html b/ui/app/views/partials/index-closedcases.html
@@ -15,7 +15,7 @@
 				<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})">the following case</a></small>					
+					<small>Merged into <a href ui-sref="app.case.details({caseId: closedCase.mergedInto})"> case #{{closedCase.stats.mergeInto.caseId}}</a></small>					
 				</div>
 			</td>
 			<td>