#144 Update the case creation dialog to specify the case template

TheHive-Project · Mar 15, 2017 · 3338efa · 3338efa
1 parent 89259e8
commit 3338efa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/thehive-backend/app/services/CaseSrv.scala b/thehive-backend/app/services/CaseSrv.scala
@@ -57,13 +57,12 @@ class CaseSrv @Inject() (
       case Some(t) ⇒ applyTemplate(t, fieldsWithOwner)
     }
     createSrv[CaseModel, Case](caseModel, templatedCaseFields.unset("tasks"))
-      .andThen {
-        case Success(caze) ⇒
-          val taskFields = fields.getValues("tasks").collect {
-            case task: JsObject ⇒ Fields(task)
-          } ++ template.map(_.tasks().map(Fields(_))).getOrElse(Nil)
-          createSrv[TaskModel, Task, Case](taskModel, taskFields.map(caze → _))
-            .map(_ ⇒ caze)
+      .flatMap { caze ⇒
+        val taskFields = fields.getValues("tasks").collect {
+          case task: JsObject ⇒ Fields(task)
+        } ++ template.map(_.tasks().map(Fields(_))).getOrElse(Nil)
+        createSrv[TaskModel, Task, Case](taskModel, taskFields.map(caze → _))
+          .map(_ ⇒ caze)
       }
   }
 
@@ -118,4 +117,4 @@ class CaseSrv @Inject() (
       }
       .mapMaterializedValue(_ ⇒ NotUsed)
   }
-}
+}
diff --git a/ui/app/scripts/controllers/case/CaseCreationCtrl.js b/ui/app/scripts/controllers/case/CaseCreationCtrl.js
@@ -71,17 +71,7 @@
 
                 // Append title prefix
                 if ($scope.fromTemplate) {
-                    $scope.newCase.title = $scope.template.titlePrefix + ' ' + $scope.temp.titleSuffix;
-
-                    $scope.newCase.tasks = _.map($scope.template.tasks, function (task) {
-                        return {
-                            title: task.title,
-                            description: task.description,
-                            flag: false,
-                            status: 'Waiting'
-                        };
-                    });
-
+                    $scope.newCase.template = $scope.template.name;
                 } else {
                     $scope.newCase.tasks = _.map($scope.tasks, function (task) {
                         return {

diff --git a/ui/app/scripts/services/StreamSrv.js b/ui/app/scripts/services/StreamSrv.js
@@ -12,6 +12,8 @@
             },
 
             runCallbacks: function(id, objectType, message) {
+                console.debug('stream:' + id + '-' + objectType);
+
                 $rootScope.$broadcast('stream:' + id + '-' + objectType, message);
             },
 

diff --git a/ui/app/views/partials/case/case.creation.html b/ui/app/views/partials/case/case.creation.html
@@ -17,7 +17,7 @@ <h4 class="vpad10 text-primary">Case details</h4>
 
                         <div class="input-group" ng-if="fromTemplate">
                             <span class="input-group-addon">{{template.titlePrefix}}</span>
-                            <input class="form-control" name="title" ng-model="temp.titleSuffix" placeholder="Title" required type="text"/>
+                            <input class="form-control" name="title" ng-model="newCase.title" placeholder="Title" required type="text"/>
                         </div>
 
                         <p class="help-block" ng-show="caseCreateForm.title.$invalid && !caseCreateForm.title.$pristine">The case title is required.</p>
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,8 @@ @@
                 },
                 runCallbacks: function(id, objectType, message) {
+                    console.debug('stream:' + id + '-' + objectType);
                     $rootScope.$broadcast('stream:' + id + '-' + objectType, message);
                 },
@@ Expand Down @@