From f8521664873bafaa59754c2eb83fac033f3bbafb Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Fri, 16 Dec 2016 15:23:33 +0100
Subject: [PATCH] #63 Fix the error handling when inserting an observable

---
 ui/app/scripts/controllers/case/ObservableCreationCtrl.js | 6 +++++-
 ui/app/views/partials/observables/creation/error.html     | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ui/app/scripts/controllers/case/ObservableCreationCtrl.js b/ui/app/scripts/controllers/case/ObservableCreationCtrl.js
index 4d46d27c5d..48a3c028e6 100644
--- 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
index 4b6efa15ef..94243e002b 100644
--- 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>