From 59a564cc1bacd6a4d49e78fce4e8c19011b38ab6 Mon Sep 17 00:00:00 2001 From: Taras Machyshyn Date: Tue, 28 Apr 2015 14:40:50 +0300 Subject: [PATCH] FieldManager fixes --- application/Espo/Core/Utils/FieldManager.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/Espo/Core/Utils/FieldManager.php b/application/Espo/Core/Utils/FieldManager.php index 4c544f7927..23b9544197 100644 --- a/application/Espo/Core/Utils/FieldManager.php +++ b/application/Espo/Core/Utils/FieldManager.php @@ -187,11 +187,6 @@ class FieldManager } } - if (isset($fieldDef['linkDefs'])) { - $linkDefs = $fieldDef['linkDefs']; - unset($fieldDef['linkDefs']); - } - $currentOptionList = array_keys((array) $this->getFieldDef($name, $scope)); foreach ($fieldDef as $defName => $defValue) { if ( (!isset($defValue) || $defValue === '') && !in_array($defName, $currentOptionList) ) { @@ -219,6 +214,11 @@ class FieldManager $fieldDef = Util::merge($metaFieldDef, $fieldDef); } + if (isset($fieldDef['linkDefs'])) { + $linkDefs = $fieldDef['linkDefs']; + unset($fieldDef['linkDefs']); + } + $defs = array( 'fields' => array( $fieldName => $fieldDef,