Skip to content

Commit

Permalink
#76 indicate closed cases in the case listing
Browse files Browse the repository at this point in the history
  • Loading branch information
nadouani committed Jan 6, 2017
1 parent 06bc97b commit b9a1d37
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ui/app/scripts/controllers/case/CaseListCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
angular.module('theHiveControllers')
.controller('CaseListCtrl', CaseListCtrl);

function CaseListCtrl($scope, $q, CasesUISrv, StreamStatSrv, PSearchSrv, EntitySrv, UserInfoSrv, TagSrv) {
function CaseListCtrl($scope, $q, CasesUISrv, StreamStatSrv, PSearchSrv, EntitySrv, UserInfoSrv, TagSrv, CaseResolutionStatus) {
var self = this;

this.showFlow = true;
this.openEntity = EntitySrv.open;
this.getUserInfo = UserInfoSrv;
this.CaseResolutionStatus = CaseResolutionStatus;

this.uiSrv = CasesUISrv;
this.uiSrv.initContext('list');
Expand Down
7 changes: 6 additions & 1 deletion ui/app/views/partials/case/case.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ <h4>List of cases ({{$vm.list.total || 0}} of {{$vm.caseStats.count}})</h4>
<a ui-sref="app.case.details({caseId: currentCase.id})">#{{currentCase.caseId}}
-
{{currentCase.title}}</a>
<div class="merge-hints text-danger" ng-if="currentCase.mergeFrom">
<div ng-show="currentCase.status !== 'Open'" class="text-success">
<small>
(Closed at {{currentCase.endDate | showDate}} as <strong>{{$vm.CaseResolutionStatus[currentCase.resolutionStatus]}}</strong>)
</small>
</div>
<div class="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>
Expand Down

0 comments on commit b9a1d37

Please sign in to comment.