982 Fix job artifact seen flag

TheHive-Project · Jun 5, 2019 · 3fd230f · 3fd230f
1 parent ef0f87b
commit 3fd230f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/thehive-cortex/app/connectors/cortex/services/CortexAnalyzerSrv.scala b/thehive-cortex/app/connectors/cortex/services/CortexAnalyzerSrv.scala
@@ -197,6 +197,7 @@ class CortexAnalyzerSrv @Inject()(
     import org.elastic4play.services.QueryDSL._
     def findArtifactId(caze: Case, dataType: String, data: Option[String], attachmentId: Option[String]) = {
       val criteria: Seq[QueryDef] = Seq(
+        "status" ~= "Ok",
         "dataType" ~= dataType,
         withParent(caze)
       ) ++ data.map("data" ~= _) ++ attachmentId.map("attachment.id" ~= _)

diff --git a/ui/app/index.html b/ui/app/index.html
@@ -62,6 +62,7 @@
 
     <!-- build:js(.) scripts/vendor.js -->
     <!-- bower:js -->
+    <script src="bower_components/jquery/dist/jquery.js"></script>
     <script src="bower_components/angular/angular.js"></script>
     <script src="bower_components/angular-animate/angular-animate.js"></script>
     <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
@@ -74,7 +75,6 @@
     <script src="bower_components/angular-timer/dist/angular-timer.js"></script>
     <script src="bower_components/angular-touch/angular-touch.js"></script>
     <script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
-    <script src="bower_components/jquery/dist/jquery.js"></script>
     <script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
     <script src="bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js"></script>
     <script src="bower_components/dropzone/dist/min/dropzone.min.js"></script>

diff --git a/ui/app/scripts/directives/report.js b/ui/app/scripts/directives/report.js
@@ -15,7 +15,7 @@
                     .then(function (tmpl) {
                         scope.element.append($compile(tmpl)(scope));
                     }, function (/*response*/) {
-                        $templateRequest('./views/reports/' + scope.reportType + '.html', true)
+                        $templateRequest('views/reports/' + scope.reportType + '.html', true)
                             .then(function (tmpl) {
                                 scope.element.append($compile(tmpl)(scope));
                             });

diff --git a/ui/bower.json b/ui/bower.json
@@ -3,6 +3,7 @@
   "version": "3.4.0-RC1",
   "license": "AGPL-3.0",
   "dependencies": {
+    "jquery": "^3.4.1",
     "angular": "1.7.8",
     "angular-animate": "1.7.8",
     "angular-bootstrap": "2.5.0",
@@ -18,7 +19,6 @@
     "bootstrap-sass-official": "^3",
     "dropzone": "~4.3.0",
     "font-awesome": "fontawesome#^4.7.0",
-    "jquery": "^3.4.1",
     "moment": "^2.24.0",
     "ng-csv": "~0.3.6",
     "ng-tags-input": "^3.2.0",

diff --git a/ui/test/karma.conf.js b/ui/test/karma.conf.js
@@ -22,6 +22,7 @@ module.exports = function(config) {
     // list of files / patterns to load in the browser
     files: [
       // bower:js
+      'bower_components/jquery/dist/jquery.js',
       'bower_components/angular/angular.js',
       'bower_components/angular-animate/angular-animate.js',
       'bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
@@ -34,7 +35,6 @@ module.exports = function(config) {
       'bower_components/angular-timer/dist/angular-timer.js',
       'bower_components/angular-touch/angular-touch.js',
       'bower_components/angular-ui-router/release/angular-ui-router.js',
-      'bower_components/jquery/dist/jquery.js',
       'bower_components/bootstrap/dist/js/bootstrap.js',
       'bower_components/bootstrap-sass-official/assets/javascripts/bootstrap.js',
       'bower_components/dropzone/dist/min/dropzone.min.js',