#63 Fix the error handling when inserting an observable

TheHive-Project · Dec 16, 2016 · f852166 · f852166
1 parent 837a594
commit f852166
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ui/app/scripts/controllers/case/ObservableCreationCtrl.js b/ui/app/scripts/controllers/case/ObservableCreationCtrl.js
@@ -96,12 +96,16 @@
             };
 
             $scope.getFailedObservables = function(failures) {
+                if(!_.isArray(failures)) {
+                    failures = [failures];
+                }
+
                 return _.map(failures, function(observable) {
                     return {
                         data: observable.object.data,
                         type: observable.type
                     };
-                });
+                });                
             };
 
             $scope.handleSaveSuccess = function(response) {

diff --git a/ui/app/views/partials/observables/creation/error.html b/ui/app/views/partials/observables/creation/error.html
@@ -9,8 +9,9 @@
     <tbody>
         <tr ng-repeat="o in failedObservables">
             <td class="wrap">{{o.data | fang}}</td>
-            <td class="nowrap" ng-switch="o.type">
-                <span ng-switch-when="CONFLICT">Already exists</span>
+            <td class="nowrap" ng-switch="o.type">                
+                <span ng-switch-when="CreateError">Already exists</span>
+                <span ng-switch-when="ConflictError">Already exists</span>
                 <span ng-switch-when="AttributeError">Format error</span>
                 <span ng-switch-default>Unexpected error</span>
             </td>