From 4fd91e20a9dc57260c1c00567549afa7e6ba9903 Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Mon, 28 Aug 2017 16:23:59 +0200
Subject: [PATCH] #295 Display file name in observable conflict dialog

---
 ui/app/scripts/controllers/case/ObservableCreationCtrl.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/app/scripts/controllers/case/ObservableCreationCtrl.js b/ui/app/scripts/controllers/case/ObservableCreationCtrl.js
index 3fc95327e4..41665bfecc 100644
--- a/ui/app/scripts/controllers/case/ObservableCreationCtrl.js
+++ b/ui/app/scripts/controllers/case/ObservableCreationCtrl.js
@@ -102,7 +102,7 @@
 
                 return _.map(failures, function(observable) {
                     return {
-                        data: observable.object.data,
+                        data: observable.object.dataType === 'file' ? observable.object.attachment.name : observable.object.data,
                         type: observable.type
                     };
                 });