#527 Fix opening long job report from observables list

TheHive-Project · Apr 12, 2018 · 047ce9a · 047ce9a
1 parent 417209d
commit 047ce9a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/ui/app/scripts/controllers/case/CaseObservablesCtrl.js b/ui/app/scripts/controllers/case/CaseObservablesCtrl.js
@@ -641,7 +641,7 @@
                         var job = response.data;
                         var report = {
                             job: job,
-                            template: job.analyzerId,
+                            template: job.analyzerName || job.analyzerId,
                             content: job.report,
                             status: job.status,
                             startDate: job.startDate,

diff --git a/ui/app/scripts/services/CortexSrv.js b/ui/app/scripts/services/CortexSrv.js
@@ -38,7 +38,15 @@
                                     }
                                 }
                             }, {
-                                analyzerId: analyzerId
+                                _or: [
+                                  {analyzerId: analyzerId},
+                                  {
+                                    _like: {
+                                      _field: 'analyzerDefinition',
+                                      _value: analyzerId
+                                    }
+                                  }
+                                ]
                             }
                         ]
                     }

diff --git a/ui/app/views/partials/observables/list/job-report-dialog.html b/ui/app/views/partials/observables/list/job-report-dialog.html
@@ -1,7 +1,7 @@
 <div class="modal-header bg-primary">
     <h3 class="modal-title">Report of #{{$vm.report.job.analyzerId}} analysis</h3>
 </div>
-<div class="modal-body">
+<div class="modal-body observable-report">
     <report artifact="$vm.observable"
         content="$vm.report.content.full || $vm.report.content"
         report-type="long"