From cd2e3eec08b0df2ce891145e27100022712eb128 Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Tue, 23 Jan 2018 13:40:39 +0200
Subject: [PATCH] acl fix

---
 application/Espo/Resources/metadata/app/aclPortal.json | 8 ++++++--
 client/src/views/role/modals/add-field.js              | 4 +++-
 client/src/views/role/record/table.js                  | 3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/application/Espo/Resources/metadata/app/aclPortal.json b/application/Espo/Resources/metadata/app/aclPortal.json
index 52fc51e720..83ee1b3c94 100644
--- a/application/Espo/Resources/metadata/app/aclPortal.json
+++ b/application/Espo/Resources/metadata/app/aclPortal.json
@@ -80,8 +80,9 @@
                 "isInternal": false,
                 "isGlobal": false
             },
-            "User": {
-                "gender": false
+            "Email": {
+                "inboundEmails": false,
+                "emailAccounts": false
             }
         }
     },
@@ -113,6 +114,9 @@
                     "edit": "no"
                 },
                 "leads": false
+            },
+            "User": {
+                "gender": false
             }
         }
     },
diff --git a/client/src/views/role/modals/add-field.js b/client/src/views/role/modals/add-field.js
index a847568e3c..e5733edc41 100644
--- a/client/src/views/role/modals/add-field.js
+++ b/client/src/views/role/modals/add-field.js
@@ -67,7 +67,9 @@ Espo.define('views/role/modals/add-field', 'views/modal', function (Dep) {
                 var d = fields[field];
                 if (field in this.options.ignoreFieldList) return;
                 if (d.disabled) return;
-
+                if (this.getMetadata().get(['app', this.options.type, 'mandatory', 'scopeFieldLevel', this.scope, field]) !== null) {
+                    return;
+                }
                 fieldList.push(field);
             }, this);
 
diff --git a/client/src/views/role/record/table.js b/client/src/views/role/record/table.js
index d1d962c616..e11ddd4a0b 100644
--- a/client/src/views/role/record/table.js
+++ b/client/src/views/role/record/table.js
@@ -512,7 +512,8 @@ Espo.define('views/role/record/table', 'view', function (Dep) {
 
             this.createView('addField', 'views/role/modals/add-field', {
                 scope: scope,
-                ignoreFieldList: ignoreFieldList
+                ignoreFieldList: ignoreFieldList,
+                type: this.type
             }, function (view) {
                 view.render();