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

2017-04-19 16:28:22 +03:00
parent 235ee7c383 69385519d7
commit e6f7bf4d6c
1 changed files with 20 additions and 0 deletions
@@ -326,6 +326,26 @@ class Metadata
            $unsets = (array) $unsets;
        }

+        switch ($key1) {
+            case 'entityDefs':
+                //unset related additional fields, e.g. a field with "address" type
+                $unsetList = $unsets;
+                foreach ($unsetList as $unsetItem) {
+                    if (preg_match('/fields\.([^\.]+)/', $unsetItem, $matches) && isset($matches[1])) {
+                        $fieldName = $matches[1];
+                        $fieldPath = [$key1, $key2, 'fields', $fieldName];
+
+                        $additionalFields = $this->getMetadataHelper()->getAdditionalFieldList($fieldName, $this->get($fieldPath));
+                        if (is_array($additionalFields)) {
+                            foreach ($additionalFields as $additionalFieldName => $additionalFieldParams) {
+                                $unsets[] = 'fields.' . $additionalFieldName;
+                            }
+                        }
+                    }
+                }
+                break;
+        }
+
        $normalizedData = array(
            '__APPEND__',
        );