EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
ref
Yuri Kuznetsov82028df34226
diff --git a/application/Espo/Core/Utils/Metadata.php b/application/Espo/Core/Utils/Metadata.phpindex b0897b62f6..8d171b1af1 100644--- a/application/Espo/Core/Utils/Metadata.php+++ b/application/Espo/Core/Utils/Metadata.php@@ -289,20 +289,20 @@ class Metadataswitch ($key1) {case 'entityDefs':// Unset related additional fields, e.g. a field with an 'address' type.- $fieldDefinitionList = $this->get('fields');+ $defs = $this->get('fields');$unsetList = $unsets;foreach ($unsetList as $unsetItem) {if (preg_match('/fields\.([^.]+)/', $unsetItem, $matches)) {- $fieldName = $matches[1];- $fieldPath = [$key1, $key2, 'fields', $fieldName];+ $field = $matches[1];+ $fieldPath = [$key1, $key2, 'fields', $field];// @todo Revise the need. Additional fields are supposed to exist only in the build?- $additionalFields = $this->builderHelper->getAdditionalFieldList(- $fieldName,- $this->get($fieldPath, []),- $fieldDefinitionList+ $additionalFields = $this->builderHelper->getAdditionalFields(+ field: $field,+ params: $this->get($fieldPath, []),+ defs: $defs,);if (is_array($additionalFields)) {diff --git a/application/Espo/Core/Utils/Metadata/AdditionalBuilder/Fields.php b/application/Espo/Core/Utils/Metadata/AdditionalBuilder/Fields.phpindex 55cbe9994d..2ba2678f12 100644--- a/application/Espo/Core/Utils/Metadata/AdditionalBuilder/Fields.php+++ b/application/Espo/Core/Utils/Metadata/AdditionalBuilder/Fields.php@@ -50,7 +50,7 @@ class Fields implements AdditionalBuilderreturn;}- $fieldDefinitionList = Util::objectToArray($data->fields);+ $defs = Util::objectToArray($data->fields);foreach (get_object_vars($data->entityDefs) as $entityType => $entityDefsItem) {if (isset($data->entityDefs->$entityType->collection)) {@@ -75,10 +75,10 @@ class Fields implements AdditionalBuilder}foreach (get_object_vars($entityDefsItem->fields) as $field => $fieldDefsItem) {- $additionalFields = $this->builderHelper->getAdditionalFieldList(- $field,- Util::objectToArray($fieldDefsItem),- $fieldDefinitionList+ $additionalFields = $this->builderHelper->getAdditionalFields(+ field: $field,+ params: Util::objectToArray($fieldDefsItem),+ defs: $defs,);if (!$additionalFields) {diff --git a/application/Espo/Core/Utils/Metadata/BuilderHelper.php b/application/Espo/Core/Utils/Metadata/BuilderHelper.phpindex b4faaf0051..2e8a7377e7 100644--- a/application/Espo/Core/Utils/Metadata/BuilderHelper.php+++ b/application/Espo/Core/Utils/Metadata/BuilderHelper.php@@ -32,6 +32,9 @@ namespace Espo\Core\Utils\Metadata;use Espo\Core\Utils\Util;use Espo\ORM\Defs\Params\FieldParam;+/**+ * @internal+ */class BuilderHelper{/**@@ -59,40 +62,49 @@ class BuilderHelper/*** Get additional field list based on field definition in metadata 'fields'.*- * @param string $fieldName- * @param array<string, mixed> $fieldParams- * @param array<string, mixed> $definitionList+ * @param string $field+ * @param array<string, mixed> $params+ * @param array<string, mixed> $defs* @return ?array<string, mixed>+ * @internal*/- public function getAdditionalFieldList(string $fieldName, array $fieldParams, array $definitionList): ?array+ public function getAdditionalFields(string $field, array $params, array $defs): ?array{- if (empty($fieldParams['type']) || empty($definitionList)) {+ if (!$defs) {return null;}- $fieldType = $fieldParams['type'];- $fieldDefinition = $definitionList[$fieldType] ?? null;+ $type = $params['type'] ?? null;- if (- isset($fieldDefinition) &&- !empty($fieldDefinition['fields']) &&- is_array($fieldDefinition['fields'])- ) {- $copiedParams = array_intersect_key($fieldParams, array_flip($this->copiedDefParams));+ if (!$type) {+ return null;+ }++ $typeDefs = $defs[$type] ?? null;- $additionalFields = [];+ if (!$typeDefs) {+ return null;+ }++ /** @var ?array<string, mixed> $fields */+ $fields = $typeDefs['fields'] ?? null;+ /** @var string $naming */+ $naming = $typeDefs['naming'] ?? $this->defaultFieldNaming;;++ if (!is_array($fields)) {+ return null;+ }- foreach ($fieldDefinition['fields'] as $subFieldName => $subFieldParams) {- $namingType = $fieldDefinition['naming'] ?? $this->defaultFieldNaming;+ $copiedParams = array_intersect_key($params, array_flip($this->copiedDefParams));- $subFieldNaming = Util::getNaming($fieldName, $subFieldName, $namingType);+ $output = [];- $additionalFields[$subFieldNaming] = array_merge($copiedParams, $subFieldParams);- }+ foreach ($fields as $subField => $subParams) {+ $subName = Util::getNaming($field, $subField, $naming);- return $additionalFields;+ $output[$subName] = array_merge($copiedParams, $subParams);}- return null;+ return $output;}}