From cd6a157f1d682872a99b08f581c4ebe36e145341 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 31 Aug 2022 16:45:54 +0300 Subject: [PATCH] fix --- .../FieldValidators/LinkMultipleType.php | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/application/Espo/Classes/FieldValidators/LinkMultipleType.php b/application/Espo/Classes/FieldValidators/LinkMultipleType.php index 77df8006f1..f03f43c8f4 100644 --- a/application/Espo/Classes/FieldValidators/LinkMultipleType.php +++ b/application/Espo/Classes/FieldValidators/LinkMultipleType.php @@ -110,19 +110,25 @@ class LinkMultipleType return true; } + $entityDefs = $this->defs->getEntity($entity->getEntityType()); + $fieldDefs = $entityDefs->getField($field); + + if ($fieldDefs->isNotStorable()) { + return true; + } + /** @var ?array $columnsMap */ - $columnsMap = $this->defs - ->getEntity($entity->getEntityType()) - ->getField($field) - ->getParam('columns'); + $columnsMap = $fieldDefs->getParam('columns'); if ($columnsMap === null || $columnsMap === []) { return true; } - $relationDefs = $this->defs - ->getEntity($entity->getEntityType()) - ->getRelation($field); + if (!$entityDefs->hasRelation($field)) { + return true; + } + + $relationDefs = $entityDefs->getRelation($field); if (!$relationDefs->hasForeignEntityType()) { return true; @@ -206,7 +212,7 @@ class LinkMultipleType $patternName = substr($pattern, 1); $pattern = $this->metadata - ->get(['app', 'regExpPatterns', $patternName, 'pattern']) ?? + ->get(['app', 'regExpPatterns', $patternName, 'pattern']) ?? $pattern; }