viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

type fix

Browse Source
This commit is contained in:
Yuri Kuznetsov
2023-10-24 10:37:15 +03:00
parent 3ab2b37471
commit e6eb3e7099
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/Espo/Core/FieldValidation/FieldValidationManager.php
View File

@@ -138,11 +138,12 @@ class FieldValidationManager
*/
private function getMandatoryValidationList(string $entityType, string $field): array
{
/** @var ?string $fieldType */
$fieldType = $this->fieldUtil->getEntityTypeFieldParam($entityType, $field, 'type');
return
$this->metadata->get(['entityDefs', $entityType, 'fields', $field, 'mandatoryValidationList']) ??
$this->metadata->get(['fields', $fieldType, 'mandatoryValidationList']) ?? [];
$this->metadata->get(['fields', $fieldType ?? '', 'mandatoryValidationList']) ?? [];
}
/**
@@ -150,11 +151,12 @@ class FieldValidationManager
*/
private function getValidationList(string $entityType, string $field): array
{
/** @var ?string $fieldType */
$fieldType = $this->fieldUtil->getEntityTypeFieldParam($entityType, $field, 'type');
return
$this->metadata->get(['entityDefs', $entityType, 'fields', $field, 'validationList']) ??
$this->metadata->get(['fields', $fieldType, 'validationList']) ?? [];
$this->metadata->get(['fields', $fieldType ?? '', 'validationList']) ?? [];
}
/**

3
application/Espo/Core/FieldValidation/ValidatorFactory.php
View File

@@ -69,11 +69,12 @@ class ValidatorFactory
*/
private function getClassName(string $entityType, string $field, string $type): ?string
{
/** @var ?string $fieldType */
$fieldType = $this->fieldUtil->getEntityTypeFieldParam($entityType, $field, 'type');
return
$this->metadata->get(['entityDefs', $entityType, 'fields', $field, 'validatorClassNameMap', $type]) ??
$this->metadata->get(['fields', $fieldType, 'validatorClassNameMap', $type]);
$this->metadata->get(['fields', $fieldType ?? '', 'validatorClassNameMap', $type]);
}
/**