diff --git a/application/Espo/Resources/i18n/en_US/Email.json b/application/Espo/Resources/i18n/en_US/Email.json index 617fbc2cfa..f1540e2309 100644 --- a/application/Espo/Resources/i18n/en_US/Email.json +++ b/application/Espo/Resources/i18n/en_US/Email.json @@ -28,5 +28,9 @@ "labels": { "Create Email": "Archive Email", "Compose": "Compose" + }, + "presetFilters": { + "sent": "Sent", + "archived": "Archived" } } diff --git a/application/Espo/Resources/i18n/en_US/Global.json b/application/Espo/Resources/i18n/en_US/Global.json index 1c5fd550f8..22c3641327 100644 --- a/application/Espo/Resources/i18n/en_US/Global.json +++ b/application/Espo/Resources/i18n/en_US/Global.json @@ -109,7 +109,8 @@ "You": "You", "you": "you", "change": "change", - "Primary": "Primary" + "Primary": "Primary", + "Save Filters": "Save Filters" }, "messages": { "notModified": "You have not modified the record", diff --git a/application/Espo/Resources/layouts/Email/filters.json b/application/Espo/Resources/layouts/Email/filters.json index d27fd80922..43fb6c35d6 100644 --- a/application/Espo/Resources/layouts/Email/filters.json +++ b/application/Espo/Resources/layouts/Email/filters.json @@ -1,6 +1,7 @@ [ "emailAddress", "dateSent", + "status", "parent", "body" ] diff --git a/application/Espo/Resources/metadata/clientDefs/Email.json b/application/Espo/Resources/metadata/clientDefs/Email.json index 0be44cc41b..0a83f50ccc 100644 --- a/application/Espo/Resources/metadata/clientDefs/Email.json +++ b/application/Espo/Resources/metadata/clientDefs/Email.json @@ -1,19 +1,39 @@ { - "controller": "Controllers.Record", - "model": "Models.Email", - "views":{ - "list":"Email.List" - }, - "menu": { - "list": { - "buttons": [ - { - "label": "Compose", - "action": "composeEmail", - "style": "danger", - "acl": "edit" - } - ] - } - } + "controller": "Controllers.Record", + "model": "Models.Email", + "views":{ + "list":"Email.List" + }, + "menu": { + "list": { + "buttons": [ + { + "label": "Compose", + "action": "composeEmail", + "style": "danger", + "acl": "edit" + } + ] + } + }, + "presetFilters": [ + { + "name":"archived", + "data": { + "status": { + "type": "in", + "value": ["Archived"] + } + } + }, + { + "name":"sent", + "data": { + "status": { + "type": "in", + "value": ["Sent"] + } + } + } + ] } diff --git a/application/Espo/Resources/metadata/entityDefs/Preferences.json b/application/Espo/Resources/metadata/entityDefs/Preferences.json index d3923f7797..db9270a58d 100644 --- a/application/Espo/Resources/metadata/entityDefs/Preferences.json +++ b/application/Espo/Resources/metadata/entityDefs/Preferences.json @@ -41,6 +41,9 @@ "dashletOptions": { "type": "text" }, + "presetFilters": { + "type": "text" + }, "smtpEmailAddress": { "type": "varchar", "readOnly": true,