espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/5.6.14' of ssh://172.20.0.1/var/git/espo/backend into hotfix/5.6.14

Browse Source
This commit is contained in:
yuri
2019-09-17 17:35:54 +03:00
parent e79e75c0d5 9c2a125365
commit 88bc592fcd
1 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Utils/FieldManager.php
+19 -28
View File
@@ -271,7 +271,7 @@ class FieldManager
$entityDefs = $this->normalizeDefs($scope, $name, $fieldDefs);
if (!empty($entityDefs)) {
if (!empty((array) $entityDefs)) {
$result &= $this->saveCustomEntityDefs($scope, $entityDefs);
$this->isChanged = true;
}
@@ -430,13 +430,15 @@ class FieldManager
return $this->getMetadata()->get('entityDefs'.'.'.$scope.'.fields.'.$name, $default);
}
protected function getCustomFieldDefs($scope, $name)
protected function getCustomFieldDefs($scope, $name, $default = null)
{
$customDefs = $this->getMetadata()->getCustom('entityDefs', $scope, (object) []);
if (isset($customDefs->fields->$name)) {
return (array) $customDefs->fields->$name;
}
return $default;
}
protected function saveCustomEntityDefs($scope, $newDefs)
@@ -529,43 +531,32 @@ class FieldManager
}
}
$actualCustomFieldDefs = $this->getCustomFieldDefs($scope, $name);
$actualCustomFieldDefs = $this->getCustomFieldDefs($scope, $name, []);
$actualFieldDefs = $this->getFieldDefs($scope, $name, []);
$permittedParamList = array_keys($params);
$filteredFieldDefs = $actualCustomFieldDefs ? $actualCustomFieldDefs : [];
$filteredFieldDefs = !empty($actualCustomFieldDefs) ? $actualCustomFieldDefs : [];
foreach ($fieldDefs as $paramName => $paramValue) {
if (in_array($paramName, $permittedParamList)) {
$defaultParamValue = null;
switch ($params[$paramName]['type']) {
case 'bool':
$fieldDefsDefaultValue = array_key_exists('default', $params[$paramName]) ? $params[$paramName]['default'] : false;
$actualValue = array_key_exists($paramName, $actualFieldDefs) ? $actualFieldDefs[$paramName] : $fieldDefsDefaultValue;
if (!Util::areValuesEqual($actualValue, $paramValue)) {
$filteredFieldDefs[$paramName] = $paramValue;
}
$defaultParamValue = false;
break;
}
default:
if (!array_key_exists('default', $params[$paramName]) && !array_key_exists($paramName, $actualFieldDefs)) {
$filteredFieldDefs[$paramName] = $paramValue;
break;
}
$actualValue = array_key_exists($paramName, $actualFieldDefs) ? $actualFieldDefs[$paramName] : $defaultParamValue;
if (array_key_exists('default', $params[$paramName])) {
$actualValue = $params[$paramName]['default'];
}
if (!array_key_exists($paramName, $actualCustomFieldDefs) && !Util::areValuesEqual($actualValue, $paramValue)) {
$filteredFieldDefs[$paramName] = $paramValue;
continue;
}
if (array_key_exists($paramName, $actualFieldDefs)) {
$actualValue = $actualFieldDefs[$paramName];
}
if (!Util::areValuesEqual($actualValue, $paramValue)) {
$filteredFieldDefs[$paramName] = $paramValue;
}
break;
if (array_key_exists($paramName, $actualCustomFieldDefs)) {
$filteredFieldDefs[$paramName] = $paramValue;
}
}
}
@@ -593,7 +584,7 @@ class FieldManager
* @param string $scope
* @param string $fieldName
* @param array $fieldDefs
* @return array
* @return object
*/
protected function normalizeDefs($scope, $fieldName, array $fieldDefs)
{