From ea5dcfe6308f0d93ed2ea06e18a1445df9bacb48 Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Thu, 5 May 2016 12:12:40 +0300
Subject: [PATCH] entity manager trimming

---
 application/Espo/Core/Utils/EntityManager.php     |  6 ++++--
 application/Espo/Core/Utils/FieldManager.php      |  1 +
 .../admin/entity-manager/modals/edit-entity.js    |  9 ++++++---
 .../src/views/admin/link-manager/modals/edit.js   | 15 ++++++++++-----
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/application/Espo/Core/Utils/EntityManager.php b/application/Espo/Core/Utils/EntityManager.php
index 1935f38905..c08016f2b1 100644
--- a/application/Espo/Core/Utils/EntityManager.php
+++ b/application/Espo/Core/Utils/EntityManager.php
@@ -82,6 +82,8 @@ class EntityManager
             throw new Error();
         }
 
+        $name = trim($name);
+
         $normalizedName = Util::normilizeClassName($name);
 
         $contents = "<" . "?" . "php\n\n".
@@ -270,9 +272,9 @@ class EntityManager
         $linkType = $params['linkType'];
 
         $entity = $params['entity'];
-        $link = $params['link'];
+        $link = trim($params['link']);
         $entityForeign = $params['entityForeign'];
-        $linkForeign = $params['linkForeign'];
+        $linkForeign = trim($params['linkForeign']);
 
         $label = $params['label'];
         $labelForeign = $params['labelForeign'];
diff --git a/application/Espo/Core/Utils/FieldManager.php b/application/Espo/Core/Utils/FieldManager.php
index 46c37b07b3..b69f36efb7 100644
--- a/application/Espo/Core/Utils/FieldManager.php
+++ b/application/Espo/Core/Utils/FieldManager.php
@@ -89,6 +89,7 @@ class FieldManager
 
     public function update($name, $fieldDefs, $scope)
     {
+        $name = trim($name);
         /*Add option to metadata to identify the custom field*/
         if (!$this->isCore($name, $scope)) {
             $fieldDefs[$this->customOptionName] = true;
diff --git a/client/src/views/admin/entity-manager/modals/edit-entity.js b/client/src/views/admin/entity-manager/modals/edit-entity.js
index 228c98d352..4f5f7e00b2 100644
--- a/client/src/views/admin/entity-manager/modals/edit-entity.js
+++ b/client/src/views/admin/entity-manager/modals/edit-entity.js
@@ -120,7 +120,8 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
                 defs: {
                     name: 'name',
                     params: {
-                        required: true
+                        required: true,
+                        trim: true
                     }
                 },
                 readOnly: scope != false
@@ -132,7 +133,8 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
                 defs: {
                     name: 'labelSingular',
                     params: {
-                        required: true
+                        required: true,
+                        trim: true
                     }
                 }
             });
@@ -143,7 +145,8 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
                 defs: {
                     name: 'labelPlural',
                     params: {
-                        required: true
+                        required: true,
+                        trim: true
                     }
                 }
             });
diff --git a/client/src/views/admin/link-manager/modals/edit.js b/client/src/views/admin/link-manager/modals/edit.js
index e53cc5e5bf..620461c696 100644
--- a/client/src/views/admin/link-manager/modals/edit.js
+++ b/client/src/views/admin/link-manager/modals/edit.js
@@ -174,7 +174,8 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
                 defs: {
                     name: 'link',
                     params: {
-                        required: true
+                        required: true,
+                        trim: true
                     }
                 },
                 readOnly: !isNew
@@ -186,7 +187,8 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
                 defs: {
                     name: 'linkForeign',
                     params: {
-                        required: true
+                        required: true,
+                        trim: true
                     }
                 },
                 readOnly: !isNew
@@ -198,7 +200,8 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
                 defs: {
                     name: 'label',
                     params: {
-                        required: true
+                        required: true,
+                        trim: true
                     }
                 }
             });
@@ -209,7 +212,8 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
                 defs: {
                     name: 'labelForeign',
                     params: {
-                        required: true
+                        required: true,
+                        trim: true
                     }
                 }
             });
@@ -222,7 +226,8 @@ Espo.define('views/admin/link-manager/modals/edit', ['views/modal', 'views/admin
                     defs: {
                         name: 'relationName',
                         params: {
-                            required: true
+                            required: true,
+                            trim: true
                         }
                     },
                     readOnly: !isNew