email filtering fix

2026-06-28 06:56:05 +00:00 · 2016-10-20 11:26:41 +03:00
parent 7fbc9fbac8
commit 1eb258cab7
1 changed files with 12 additions and 1 deletions
--- a/application/Espo/SelectManagers/Email.php
+++ b/application/Espo/SelectManagers/Email.php
@@ -121,11 +121,22 @@ class Email extends \Espo\Core\SelectManagers\Base
            'usersMiddle.inTrash=' => false,
            'usersMiddle.folderId' => null,
            array(
-                'status!=' => 'Draft'
+                'status' => ['Archived', 'Sent']
            )
        );
        if (!empty($idList)) {
            $d['fromEmailAddressId!='] = $idList;
+            $d[] = array(
+                'OR' => array(
+                    'status' => 'Archived',
+                    'createdById!=' => $this->getUser()->id
+                )
+            );
+        } else {
+            $d[] = array(
+                'status' => 'Archived',
+                'createdById!=' => $this->getUser()->id
+            );
        }
        $result['whereClause'][] = $d;