From a56502b814f475e59e09d44d43ee0ff40ec9ff72 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Mon, 14 Aug 2017 16:38:33 +0300
Subject: [PATCH] show loading if email address in not loaded

---
 .../templates/email/fields/email-address-varchar/detail.tpl | 2 +-
 client/src/views/email/fields/email-address-varchar.js      | 6 ++++++
 client/src/views/email/fields/from-address-varchar.js       | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/client/res/templates/email/fields/email-address-varchar/detail.tpl b/client/res/templates/email/fields/email-address-varchar/detail.tpl
index 25060bd18e..4f4675c512 100644
--- a/client/res/templates/email/fields/email-address-varchar/detail.tpl
+++ b/client/res/templates/email/fields/email-address-varchar/detail.tpl
@@ -1,5 +1,5 @@
 {{#if value}}
     {{{value}}}
 {{else}}
-    {{{translate 'None'}}}
+    {{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
 {{/if}}
diff --git a/client/src/views/email/fields/email-address-varchar.js b/client/src/views/email/fields/email-address-varchar.js
index 44a769d017..28fd50c28c 100644
--- a/client/src/views/email/fields/email-address-varchar.js
+++ b/client/src/views/email/fields/email-address-varchar.js
@@ -35,6 +35,12 @@ Espo.define('views/email/fields/email-address-varchar', ['views/fields/varchar',
 
         emailAddressRegExp: /([a-zA-Z0-9._-]+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+)/gi,
 
+        data: function () {
+            var data = Dep.prototype.data.call(this);
+            data.valueIsSet = this.model.has(this.name);
+            return data;
+        },
+
         events: {
             'click a[data-action="clearAddress"]': function (e) {
                 var address = $(e.currentTarget).data('address').toString();
diff --git a/client/src/views/email/fields/from-address-varchar.js b/client/src/views/email/fields/from-address-varchar.js
index 070b09182b..e03ffc2b87 100644
--- a/client/src/views/email/fields/from-address-varchar.js
+++ b/client/src/views/email/fields/from-address-varchar.js
@@ -39,6 +39,12 @@ Espo.define('views/email/fields/from-address-varchar', 'views/fields/varchar', f
             }, this);
         },
 
+        data: function () {
+            var data = Dep.prototype.data.call(this);
+            data.valueIsSet = this.model.has(this.name);
+            return data;
+        },
+
         events: {
             'click [data-action="createContact"]': function (e) {
                 var address = $(e.currentTarget).data('address');