From 71ec8d27a31d002c8d2cf537a53d1fdc2eaca2ed Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Mon, 16 Nov 2020 14:39:21 +0100
Subject: [PATCH] #1651 Fix the case attachment list

---
 .../controllers/case/CaseDetailsCtrl.js       | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/ui/app/scripts/controllers/case/CaseDetailsCtrl.js b/ui/app/scripts/controllers/case/CaseDetailsCtrl.js
index 8573a3a07a..cca226dbbd 100644
--- a/ui/app/scripts/controllers/case/CaseDetailsCtrl.js
+++ b/ui/app/scripts/controllers/case/CaseDetailsCtrl.js
@@ -25,12 +25,23 @@
                         '_parent': {
                             '_type': 'case_task',
                             '_query': {
-                                '_parent': {
-                                    '_type': 'case',
-                                    '_query': {
-                                        '_id': $scope.caseId
+                                _and: [
+                                    {
+                                        '_parent': {
+                                            '_type': 'case',
+                                            '_query': {
+                                                '_id': $scope.caseId
+                                            }
+                                        }
+                                    },
+                                    {
+                                        _not: {
+                                            status: 'Cancel'
+                                        }
                                     }
-                                }
+                                ]
+
+
                             }
                         }
                     }
@@ -95,7 +106,7 @@
         $scope.openAttachment = function(attachment) {
             $state.go('app.case.tasks-item', {
                 caseId: $scope.caze.id,
-                itemId: attachment.case_task.id
+                itemId: attachment.case_task ? attachment.case_task.id : attachment._parent
             });
         };