From bfd611d6fe4b4ab7b78fa14cc050f342fc446f83 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurak@list.ru>
Date: Mon, 20 Oct 2014 12:38:25 +0300
Subject: [PATCH] no smtp sutup message

---
 application/Espo/Resources/i18n/en_US/Email.json     |  3 +++
 .../email/fields/compose-from-address/edit.tpl       | 12 ++++++++----
 .../src/views/email/fields/compose-from-address.js   |  5 +++--
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/application/Espo/Resources/i18n/en_US/Email.json b/application/Espo/Resources/i18n/en_US/Email.json
index d88f525e27..3c1ffa2f5b 100644
--- a/application/Espo/Resources/i18n/en_US/Email.json
+++ b/application/Espo/Resources/i18n/en_US/Email.json
@@ -37,6 +37,9 @@
         "Forwarded message": "Forwarded message",
         "Email Accounts": "Email Accounts"
     },
+    "messages": {
+        "noSmtpSetup": "No SMTP setup. {link}."
+    },
     "presetFilters": {
         "sent": "Sent",
         "archived": "Archived"
diff --git a/frontend/client/res/templates/email/fields/compose-from-address/edit.tpl b/frontend/client/res/templates/email/fields/compose-from-address/edit.tpl
index 1c295096e7..a33b219137 100644
--- a/frontend/client/res/templates/email/fields/compose-from-address/edit.tpl
+++ b/frontend/client/res/templates/email/fields/compose-from-address/edit.tpl
@@ -1,5 +1,9 @@
-<select name="{{name}}" class="form-control main-element">
-{{#each list}}
-    <option value="{{./this}}">{{./this}}</optopn>
-{{/each}}    
+{{#if list.length}}
+    <select name="{{name}}" class="form-control main-element">
+    {{#each list}}
+        <option value="{{./this}}">{{./this}}</optopn>
+    {{/each}}    
 </select>
+{{else}}
+    {{{noSmtpMessage}}}    
+{{/if}}
diff --git a/frontend/client/src/views/email/fields/compose-from-address.js b/frontend/client/src/views/email/fields/compose-from-address.js
index 348573aa36..095bc405f2 100644
--- a/frontend/client/src/views/email/fields/compose-from-address.js
+++ b/frontend/client/src/views/email/fields/compose-from-address.js
@@ -27,6 +27,7 @@ Espo.define('Views.Email.Fields.ComposeFromAddress', 'Views.Fields.Base', functi
         data: function () {
             return _.extend({
                 list: this.list,
+                noSmtpMessage: this.translate('noSmtpSetup', 'messages', 'Email').replace('{link}', '<a href="#Preferences">'+this.translate('Preferences')+'</a>')
             }, Dep.prototype.data.call(this));
         },
 
@@ -34,13 +35,13 @@ Espo.define('Views.Email.Fields.ComposeFromAddress', 'Views.Fields.Base', functi
             Dep.prototype.setup.call(this);
             this.list = [];
             
-            if (this.getUser().get('emailAddress')) {
+            if (this.getUser().get('emailAddress') && this.getPreferences().get('smtpServer')) {
                 this.list.push(this.getUser().get('emailAddress'));
             }
             
             if (this.getConfig().get('outboundEmailIsShared') && this.getConfig().get('outboundEmailFromAddress')) {
                 this.list.push(this.getConfig().get('outboundEmailFromAddress'));
-            }
+            }            
         },
     });