From ca9253ecd575b21e6c8d50c4e77926ea1a66a2f6 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Wed, 16 Aug 2017 14:39:42 +0300
Subject: [PATCH] email account assigned user required

---
 .../Resources/metadata/entityDefs/EmailAccount.json  |  2 +-
 client/src/views/email-account/record/detail.js      | 11 ++++++-----
 client/src/views/email-account/record/edit.js        | 12 ++++++------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/application/Espo/Resources/metadata/entityDefs/EmailAccount.json b/application/Espo/Resources/metadata/entityDefs/EmailAccount.json
index eb0d794761..2dc9348ed2 100644
--- a/application/Espo/Resources/metadata/entityDefs/EmailAccount.json
+++ b/application/Espo/Resources/metadata/entityDefs/EmailAccount.json
@@ -78,7 +78,7 @@
         },
         "assignedUser": {
             "type": "link",
-            "readOnly": true
+            "required": true
         },
         "useSmtp": {
             "type": "bool"
diff --git a/client/src/views/email-account/record/detail.js b/client/src/views/email-account/record/detail.js
index 92dc15579c..b231492b54 100644
--- a/client/src/views/email-account/record/detail.js
+++ b/client/src/views/email-account/record/detail.js
@@ -39,13 +39,14 @@ Espo.define('views/email-account/record/detail', 'views/record/detail', function
             if (this.wasFetched()) {
                 this.setFieldReadOnly('fetchSince');
             }
+        },
 
+        setup: function () {
+            Dep.prototype.setup.call(this);
             if (this.getUser().isAdmin()) {
-                var fieldView = this.getFieldView('assignedUser');
-                if (fieldView) {
-                    fieldView.readOnly = false;
-                    fieldView.render();
-                }
+                this.setFieldNotReadOnly('assignedUser');
+            } else {
+                this.setFieldReadOnly('assignedUser');
             }
         },
 
diff --git a/client/src/views/email-account/record/edit.js b/client/src/views/email-account/record/edit.js
index 0618c1f91f..55fd4da97c 100644
--- a/client/src/views/email-account/record/edit.js
+++ b/client/src/views/email-account/record/edit.js
@@ -39,14 +39,14 @@ Espo.define('views/email-account/record/edit', ['views/record/edit', 'views/emai
             if (Detail.prototype.wasFetched.call(this)) {
                 this.setFieldReadOnly('fetchSince');
             }
+        },
 
+        setup: function () {
+            Dep.prototype.setup.call(this);
             if (this.getUser().isAdmin()) {
-                var fieldView = this.getFieldView('assignedUser');
-                if (fieldView) {
-                    fieldView.readOnly = false;
-                    fieldView.setMode('edit');
-                    fieldView.render();
-                }
+                this.setFieldNotReadOnly('assignedUser');
+            } else {
+                this.setFieldReadOnly('assignedUser');
             }
         },