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

Metadata: code improvements

Browse Source
This commit is contained in:
Taras Machyshyn
2015-04-28 15:28:26 +03:00
parent 8ce806d41f
commit 0f62d7da13
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Core/Utils/Database/Orm/Converter.php
+7 -7
View File
@@ -29,7 +29,7 @@ class Converter
{
private $metadata;
private $fileManager;
private $metadataUtils;
private $metadataHelper;
private $relationManager;
@@ -89,7 +89,7 @@ class Converter
$this->relationManager = new RelationManager($this->metadata);
$this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata);
$this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata);
}
protected function getMetadata()
@@ -116,9 +116,9 @@ class Converter
return $this->relationManager;
}
protected function getMetadataUtils()
protected function getMetadataHelper()
{
return $this->metadataUtils;
return $this->metadataHelper;
}
public function process()
@@ -223,7 +223,7 @@ class Converter
foreach($entityMeta['fields'] as $fieldName => $fieldParams) {
/** check if "fields" option exists in $fieldMeta */
$fieldTypeMeta = $this->getMetadataUtils()->getFieldDefsByType($fieldParams);
$fieldTypeMeta = $this->getMetadataHelper()->getFieldDefsByType($fieldParams);
$fieldDefs = $this->convertField($entityName, $fieldName, $fieldParams, $fieldTypeMeta);
if ($fieldDefs !== false) {
@@ -232,7 +232,7 @@ class Converter
/** check and set the linkDefs from 'fields' metadata */
if (isset($fieldTypeMeta['linkDefs'])) {
$linkDefs = $this->getMetadataUtils()->getLinkDefsInFieldMeta($entityName, $fieldParams, $fieldTypeMeta['linkDefs']);
$linkDefs = $this->getMetadataHelper()->getLinkDefsInFieldMeta($entityName, $fieldParams, $fieldTypeMeta['linkDefs']);
if (isset($linkDefs)) {
if (!isset($entityMeta['links'])) {
$entityMeta['links'] = array();
@@ -312,7 +312,7 @@ class Converter
/** merge fieldDefs option from field definition */
if (!isset($fieldTypeMeta)) {
$fieldTypeMeta = $this->getMetadataUtils()->getFieldDefsByType($fieldParams);
$fieldTypeMeta = $this->getMetadataHelper()->getFieldDefsByType($fieldParams);
}
if (isset($fieldTypeMeta['fieldDefs'])) {
application/Espo/Core/Utils/EntityManager.php
+4 -4
View File
@@ -35,7 +35,7 @@ class EntityManager
private $fileManager;
private $metadataUtils;
private $metadataHelper;
public function __construct(Metadata $metadata, Language $language, File\Manager $fileManager)
{
@@ -43,7 +43,7 @@ class EntityManager
$this->language = $language;
$this->fileManager = $fileManager;
$this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata);
$this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata);
}
protected function getMetadata()
@@ -61,9 +61,9 @@ class EntityManager
return $this->fileManager;
}
protected function getMetadataUtils()
protected function getMetadataHelper()
{
return $this->metadataUtils;
return $this->metadataHelper;
}
public function create($name, $type, $params = array())
application/Espo/Core/Utils/FieldManager.php
+6 -6
View File
@@ -31,7 +31,7 @@ class FieldManager
private $language;
private $metadataUtils;
private $metadataHelper;
protected $isChanged = null;
@@ -44,7 +44,7 @@ class FieldManager
$this->metadata = $metadata;
$this->language = $language;
$this->metadataUtils = new \Espo\Core\Utils\Metadata\Utils($this->metadata);
$this->metadataHelper = new \Espo\Core\Utils\Metadata\Helper($this->metadata);
}
protected function getMetadata()
@@ -57,9 +57,9 @@ class FieldManager
return $this->language;
}
protected function getMetadataUtils()
protected function getMetadataHelper()
{
return $this->metadataUtils;
return $this->metadataHelper;
}
public function read($name, $scope)
@@ -209,7 +209,7 @@ class FieldManager
{
$fieldDef = $this->prepareFieldDef($fieldName, $fieldDef, $scope);
$metaFieldDef = $this->getMetadataUtils()->getFieldDefsInFieldMeta($fieldDef);
$metaFieldDef = $this->getMetadataHelper()->getFieldDefsInFieldMeta($fieldDef);
if (isset($metaFieldDef)) {
$fieldDef = Util::merge($metaFieldDef, $fieldDef);
}
@@ -226,7 +226,7 @@ class FieldManager
);
/** Save links for a field. */
$metaLinkDef = $this->getMetadataUtils()->getLinkDefsInFieldMeta($scope, $fieldDef);
$metaLinkDef = $this->getMetadataHelper()->getLinkDefsInFieldMeta($scope, $fieldDef);
if (isset($linkDefs) || isset($metaLinkDef)) {
$linkDefs = Util::merge((array) $metaLinkDef, (array) $linkDefs);
$defs['links'] = array(
application/Espo/Core/Utils/Metadata.php
+6 -6
View File
@@ -35,7 +35,7 @@ class Metadata
private $fileManager;
private $converter;
private $moduleConfig;
private $metadataUtils;
private $metadataHelper;
/**
* @var string - uses for loading default values
@@ -110,13 +110,13 @@ class Metadata
return $this->moduleConfig;
}
protected function getMetadataUtils()
protected function getMetadataHelper()
{
if (!isset($this->metadataUtils)) {
$this->metadataUtils = new Metadata\Utils($this);
if (!isset($this->metadataHelper)) {
$this->metadataHelper = new Metadata\Helper($this);
}
return $this->metadataUtils;
return $this->metadataHelper;
}
public function isCached()
@@ -248,7 +248,7 @@ class Metadata
foreach ($metaCopy['entityDefs'] as $entityName => $entityParams) {
foreach ($entityParams['fields'] as $fieldName => $fieldParams) {
$additionalFields = $this->getMetadataUtils()->getAdditionalFieldList($fieldName, $fieldParams, $definitionList);
$additionalFields = $this->getMetadataHelper()->getAdditionalFieldList($fieldName, $fieldParams, $definitionList);
if (!empty($additionalFields)) {
//merge or add to the end of meta array
foreach ($additionalFields as $subFieldName => $subFieldParams) {
application/Espo/Core/Utils/Metadata/Utils.php → application/Espo/Core/Utils/Metadata/Helper.php
+1 -1
View File
@@ -24,7 +24,7 @@ namespace Espo\Core\Utils\Metadata;
use Espo\Core\Utils\Util;
class Utils
class Helper
{
private $metadata;