cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

chg: [metaTemplate:migrateMetaField] Ignore metafield with empty value

develop-unstable
Sami Mokaddem 2023-02-16 09:32:27 +01:00
parent a872379529
commit 27673b54c9
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Controller/MetaTemplatesController.php
View File

@ -226,13 +226,16 @@ class MetaTemplatesController extends AppController
foreach ($newestMetaTemplate->meta_template_fields as $i => $newMetaTemplateField) { foreach ($newestMetaTemplate->meta_template_fields as $i => $newMetaTemplateField) {
if ($metaTemplateField->field == $newMetaTemplateField->field && empty($newMetaTemplateField->metaFields)) { if ($metaTemplateField->field == $newMetaTemplateField->field && empty($newMetaTemplateField->metaFields)) {
$movedMetaTemplateFields[] = $metaTemplateField->id; $movedMetaTemplateFields[] = $metaTemplateField->id;
$nonEmptyMetaFields = array_filter($metaTemplateField->metaFields, function ($e) {
return $e->value !== '';
});
$copiedMetaFields = array_map(function ($e) use ($newMetaTemplateField) { $copiedMetaFields = array_map(function ($e) use ($newMetaTemplateField) {
$e = $e->toArray(); $e = $e->toArray();
$e['meta_template_id'] = $newMetaTemplateField->meta_template_id; $e['meta_template_id'] = $newMetaTemplateField->meta_template_id;
$e['meta_template_field_id'] = $newMetaTemplateField->id; $e['meta_template_field_id'] = $newMetaTemplateField->id;
unset($e['id']); unset($e['id']);
return $e; return $e;
}, $metaTemplateField->metaFields); }, $nonEmptyMetaFields);
$newMetaTemplateField->metaFields = $this->MetaTemplates->MetaTemplateFields->MetaFields->newEntities($copiedMetaFields); $newMetaTemplateField->metaFields = $this->MetaTemplates->MetaTemplateFields->MetaFields->newEntities($copiedMetaFields);
} }
} }

3
src/Model/Table/MetaFieldsTable.php
View File

@ -94,9 +94,6 @@ class MetaFieldsTable extends AppTable
public function isValidType($value, $metaTemplateField) public function isValidType($value, $metaTemplateField)
{ {
if (empty($value)) {
return __('Metafield value cannot be empty.');
}
$typeHandler = $this->MetaTemplateFields->getTypeHandler($metaTemplateField['type']); $typeHandler = $this->MetaTemplateFields->getTypeHandler($metaTemplateField['type']);
if (!empty($typeHandler)) { if (!empty($typeHandler)) {
$success = $typeHandler->validate($value); $success = $typeHandler->validate($value);

2
src/Model/Table/MetaTemplatesTable.php
View File

@ -1305,7 +1305,7 @@ class MetaTemplatesTable extends AppTable
$updateStatus['next_version'] = $template['version']; $updateStatus['next_version'] = $template['version'];
$updateStatus['new'] = false; $updateStatus['new'] = false;
$updateStatus['automatically-updateable'] = false; $updateStatus['automatically-updateable'] = false;
if ($metaTemplate->version >= $template['version']) { if (intval($metaTemplate->version) >= intval($template['version'])) {
$updateStatus['up-to-date'] = true; $updateStatus['up-to-date'] = true;
$updateStatus['conflicts'][] = __('Could not update the template. Local version is equal or newer.'); $updateStatus['conflicts'][] = __('Could not update the template. Local version is equal or newer.');
return $updateStatus; return $updateStatus;