From 1ddac304d7ea955012337ac38eabc206873fa4db Mon Sep 17 00:00:00 2001 From: yuri Date: Tue, 21 Apr 2015 16:12:41 +0300 Subject: [PATCH] Email drafts filter --- application/Espo/Resources/i18n/en_US/Email.json | 2 +- .../Espo/Resources/metadata/clientDefs/Email.json | 12 +++--------- application/Espo/SelectManagers/Email.php | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/application/Espo/Resources/i18n/en_US/Email.json b/application/Espo/Resources/i18n/en_US/Email.json index 97f2826366..9dff1ac1a3 100644 --- a/application/Espo/Resources/i18n/en_US/Email.json +++ b/application/Espo/Resources/i18n/en_US/Email.json @@ -56,7 +56,7 @@ "sent": "Sent", "archived": "Archived", "inbox": "Inbox", - "draft": "Draft" + "drafts": "Drafts" }, "massActions": { "markAsRead": "Mark As Read" diff --git a/application/Espo/Resources/metadata/clientDefs/Email.json b/application/Espo/Resources/metadata/clientDefs/Email.json index 6b175d2dab..7f0e096c0d 100644 --- a/application/Espo/Resources/metadata/clientDefs/Email.json +++ b/application/Espo/Resources/metadata/clientDefs/Email.json @@ -54,15 +54,9 @@ } }, "filterList": [ - { - "name":"inbox" - }, - { - "name":"sent" - }, - { - "name":"draft" - } + "inbox", + "sent", + "drafts" ], "defaultFilterData": { "presetName": "inbox", diff --git a/application/Espo/SelectManagers/Email.php b/application/Espo/SelectManagers/Email.php index 887ed1cdec..61f6326626 100644 --- a/application/Espo/SelectManagers/Email.php +++ b/application/Espo/SelectManagers/Email.php @@ -59,7 +59,7 @@ class Email extends \Espo\Core\SelectManagers\Base ); } - protected function filterDraft(&$result) + protected function filterDrafts(&$result) { $result['whereClause'][] = array( 'status' => 'Draft',