Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Remove unnecessary duplicated 'text' property

Browse Source 
[MAILPOET-3073]
This commit is contained in:
Ján Mikláš
2020-10-28 15:14:25 +01:00
committed by Veljko V
parent 88e088c07e
commit 4045fba527
4 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Subscribers/ImportExport/ImportExportFactory.php
View File

@@ -40,7 +40,6 @@ class ImportExportFactory {
return [
'id' => $segment['id'],
'name' => $segment['name'],
'text' => $segment['name'], // Required select2 property
'count' => $segment['subscribers'],
];
}, $segments);
@@ -70,7 +69,6 @@ class ImportExportFactory {
return [
'id' => $fieldId,
'name' => $fieldName,
'text' => $fieldName,
'type' => ($fieldId === 'confirmed_at') ? 'date' : null,
'custom' => false,
];
@@ -86,7 +84,6 @@ class ImportExportFactory {
return [
'id' => $field['id'],
'name' => $field['name'],
'text' => $field['name'],
'type' => $field['type'],
'params' => unserialize($field['params']),
'custom' => true,
@@ -102,42 +99,35 @@ class ImportExportFactory {
[
'id' => 'ignore',
'name' => __('Ignore field...', 'mailpoet'),
'text' => __('Ignore field...', 'mailpoet'),
],
[
'id' => 'create',
'name' => __('Create new field...', 'mailpoet'),
'text' => __('Create new field...', 'mailpoet'),
],
] :
[
[
'id' => 'select',
'name' => __('Select all...', 'mailpoet'),
'text' => __('Select all...', 'mailpoet'),
],
[
'id' => 'deselect',
'name' => __('Deselect all...', 'mailpoet'),
'text' => __('Deselect all...', 'mailpoet'),
],
];
$select2Fields = [
[
'name' => __('Actions', 'mailpoet'),
'text' => __('Actions', 'mailpoet'),
'children' => $actions,
],
[
'name' => __('System fields', 'mailpoet'),
'text' => __('System fields', 'mailpoet'),
'children' => $this->formatSubscriberFields($subscriberFields),
],
];
if ($subscriberCustomFields) {
array_push($select2Fields, [
'name' => __('User fields', 'mailpoet'),
'text' => __('User fields', 'mailpoet'),
'children' => $this->formatSubscriberCustomFields(
$subscriberCustomFields
),