From e8c570f5dfbd34f6fc32fa0c831e9943b8f1df70 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 28 Jan 2016 16:10:29 +0200 Subject: [PATCH] fix emailReplyToAllByDefault --- application/Espo/Resources/i18n/en_US/Preferences.json | 2 +- application/Espo/Resources/layouts/Preferences/detail.json | 2 +- application/Espo/Resources/metadata/entityDefs/Preferences.json | 2 +- frontend/client/modules/crm/src/views/record/panels/history.js | 2 +- frontend/client/src/views/email/detail.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/application/Espo/Resources/i18n/en_US/Preferences.json b/application/Espo/Resources/i18n/en_US/Preferences.json index 44ff2df6a6..9d4f3143c1 100644 --- a/application/Espo/Resources/i18n/en_US/Preferences.json +++ b/application/Espo/Resources/i18n/en_US/Preferences.json @@ -26,7 +26,7 @@ "theme": "Theme", "useCustomTabList": "Custom Tab List", "tabList": "Tab List", - "replyEmailToAllByDefault": "Reply Email to All by Default" + "emailReplyToAllByDefault": "Email Reply to All by Default" }, "links": { }, diff --git a/application/Espo/Resources/layouts/Preferences/detail.json b/application/Espo/Resources/layouts/Preferences/detail.json index e21112407d..eeaa3f1188 100644 --- a/application/Espo/Resources/layouts/Preferences/detail.json +++ b/application/Espo/Resources/layouts/Preferences/detail.json @@ -46,7 +46,7 @@ ], [ { - "name": "replyEmailToAllByDefault" + "name": "emailReplyToAllByDefault" }, false ] diff --git a/application/Espo/Resources/metadata/entityDefs/Preferences.json b/application/Espo/Resources/metadata/entityDefs/Preferences.json index 35094a952f..310dc0161d 100644 --- a/application/Espo/Resources/metadata/entityDefs/Preferences.json +++ b/application/Espo/Resources/metadata/entityDefs/Preferences.json @@ -123,7 +123,7 @@ "translation": "Global.scopeNamesPlural", "view": "views/preferences/fields/tab-list" }, - "replyEmailToAllByDefault": { + "emailReplyToAllByDefault": { "type": "bool", "default": true } diff --git a/frontend/client/modules/crm/src/views/record/panels/history.js b/frontend/client/modules/crm/src/views/record/panels/history.js index a1439d51c7..7e1750b93b 100644 --- a/frontend/client/modules/crm/src/views/record/panels/history.js +++ b/frontend/client/modules/crm/src/views/record/panels/history.js @@ -193,7 +193,7 @@ Espo.define('crm:views/record/panels/history', 'crm:views/record/panels/activiti this.getModelFactory().create('Email', function (model) { model.id = id; this.listenToOnce(model, 'sync', function () { - var attributes = emailHelper.getReplyAttributes(model, data, this.getPreferences().get('replyEmailToAllByDefault')); + var attributes = emailHelper.getReplyAttributes(model, data, this.getPreferences().get('emailReplyToAllByDefault')); this.createView('quickCreate', 'views/modals/compose-email', { attributes: attributes, }, function (view) { diff --git a/frontend/client/src/views/email/detail.js b/frontend/client/src/views/email/detail.js index 8bb12a6562..0a3a30d784 100644 --- a/frontend/client/src/views/email/detail.js +++ b/frontend/client/src/views/email/detail.js @@ -51,7 +51,7 @@ Espo.define('views/email/detail', ['views/detail', 'email-helper'], function (De this.addMenuItem('buttons', { name: 'reply', label: 'Reply', - action: this.getPreferences().get('replyEmailToAllByDefault') ? 'replyToAll' : 'reply', + action: this.getPreferences().get('emailReplyToAllByDefault') ? 'replyToAll' : 'reply', style: 'danger' }, true);