Skip to content

Fix localizefields for Pimcore 11 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gajdusek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix localizefields for Pimcore 11 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/DefinitionsCollection/Factory/FieldDefinitionFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,24 @@ class FieldDefinitionFactory

public function get(DataQualityFieldDefinition $definition): FieldDefinition
{
list($fieldName, $title) = explode('@@@', $definition->getField());
$definitionField = $definition->getField();

if (strpos($title, '###')) {
list($title, $language) = explode('###', $title);
$fieldName = null;
$title = '';
$language = null;

if (preg_match('/^(.*)@@@(.*)###(.*)$/', $definitionField, $matches)) {
$fieldName = $matches[1];
$title = $matches[2];
$language = $matches[3];
} elseif (preg_match('/^(.*)###(.*)$/', $definitionField, $matches)) {
$fieldName = $matches[1];
$language = $matches[2];
} elseif (preg_match('/^(.*)@@@(.*)$/', $definitionField, $matches)) {
$fieldName = $matches[1];
$title= $matches[2];
} else {
$fieldName = $definitionField;
}

return new FieldDefinition(
Expand Down
40 changes: 24 additions & 16 deletions src/Provider/DataQualityProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function getDataQualityConfigs(?AbstractObject $dataObject): array
}

/**
* @throws DataQualityException|DefinitionException
* @throws DefinitionException
*/
public function calculateDataQuality(AbstractObject $dataObject, DataQualityConfig $dataQualityConfig): DataQualityViewModel
{
Expand All @@ -98,11 +98,10 @@ public function calculateDataQuality(AbstractObject $dataObject, DataQualityConf
continue;
}

$isLocalizedField = false;
$isLocalizedField = $this->isLocalizedField($dataObject, $fieldDefinition->getFieldName());
$classFieldDefinition = $this->getClassFieldDefinition(
$dataObject,
$fieldDefinition->getFieldName(),
$isLocalizedField
);

$validFields = [];
Expand Down Expand Up @@ -168,23 +167,32 @@ private function getDataQualityRules(DataQualityConfig $dataQualityConfig): arra
return $rules;
}

/**
* @throws DataQualityException
*/
private function getClassFieldDefinition(AbstractObject $dataObject, string $fieldName, bool &$isLocalizedField): Data
private function getClassFieldDefinition(AbstractObject $dataObject, string $fieldName): Data
{
$classFieldDefinition = $dataObject->getClass()->getFieldDefinition($fieldName);
if (empty($classFieldDefinition)) {
$localizedFields = $dataObject->getClass()->getFieldDefinition('localizedfields');
if ($localizedFields) {
$classFieldDefinition = $localizedFields->getFieldDefinition($fieldName);
$isLocalizedField = true;
} else {
throw new DataQualityException('fieldtype for field ' . $fieldName . ' is not supported.');
$classDefinition = $dataObject->getClass();
$classFieldDefinition = $classDefinition->getFieldDefinition($fieldName);

return $classFieldDefinition;
}

private function isLocalizedField(AbstractObject $dataObject, string $fieldName): bool
{
$classDefinition = $dataObject->getClass();
$fieldDefinition = $classDefinition->getFieldDefinition($fieldName);
$isLocalizedField = false;

// Loop through fields to find localizedfields container
foreach ($classDefinition->getFieldDefinitions() as $field) {
if ($field instanceof \Pimcore\Model\DataObject\ClassDefinition\Data\Localizedfields) {
$localizedFields = $field->getFieldDefinitions();
if (array_key_exists($fieldName, $localizedFields)) {
$isLocalizedField = true;
break;
}
}
}

return $classFieldDefinition;
return $isLocalizedField;
}

private function isObjectBricks(Data $fieldDefinition): bool
Expand Down