Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend

2017-06-23 12:15:39 +03:00
parent 92b6e45ef2 017c34dcde
commit b7a4fa1e7c
1 changed files with 7 additions and 0 deletions
@@ -192,6 +192,13 @@ class Converter
    {
        foreach ($ormMeta as $entityName => &$entityParams) {
            foreach ($entityParams['fields'] as $fieldName => &$fieldParams) {
+
+                /* remove fields without type */
+                if (!isset($fieldParams['type']) && (!isset($fieldParams['notStorable']) || $fieldParams['notStorable'] === false)) {
+                    unset($entityParams['fields'][$fieldName]);
+                    continue;
+                }
+
                switch ($fieldParams['type']) {
                    case 'id':
                        if ($fieldParams['dbType'] != 'int') {