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

Remove new form editor feature flag

Browse Source 
[MAILPOET-2549]
This commit is contained in:
Rostislav Wolny
2020-01-21 09:54:46 +01:00
committed by Jack Kitterhing
parent 139b3691bf
commit 447e01b0aa
13 changed files with 31 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/AdminPages/Pages/FormEditor.php
View File

@ -5,11 +5,9 @@ namespace MailPoet\AdminPages\Pages;
use MailPoet\AdminPages\PageRenderer;
use MailPoet\API\JSON\ResponseBuilders\CustomFieldsResponseBuilder;
use MailPoet\CustomFields\CustomFieldsRepository;
use MailPoet\Features\FeaturesController;
use MailPoet\Form\Block;
use MailPoet\Form\Renderer as FormRenderer;
use MailPoet\Form\Util\Export;
use MailPoet\Models\CustomField;
use MailPoet\Models\Form;
use MailPoet\Models\Segment;
use MailPoet\Settings\Pages;
@ -18,9 +16,6 @@ class FormEditor {
/** @var PageRenderer */
private $pageRenderer;
/** @var FeaturesController */
private $featuresController;
/** @var CustomFieldsRepository */
private $customFieldsRepository;
@ -29,12 +24,10 @@ class FormEditor {
public function __construct(
PageRenderer $pageRenderer,
FeaturesController $featuresController,
CustomFieldsRepository $customFieldsRepository,
CustomFieldsResponseBuilder $customFieldsResponseBuilder
) {
$this->pageRenderer = $pageRenderer;
$this->featuresController = $featuresController;
$this->customFieldsRepository = $customFieldsRepository;
$this->customFieldsResponseBuilder = $customFieldsResponseBuilder;
}
@ -45,7 +38,9 @@ class FormEditor {
if ($form instanceof Form) {
$form = $form->asArray();
}
$form['styles'] = FormRenderer::getStyles($form);
$customFields = $this->customFieldsRepository->findAll();
$dateTypes = Block\Date::getDateTypes();
$data = [
'form' => $form,
'form_exports' => [
@ -56,25 +51,24 @@ class FormEditor {
'pages' => Pages::getAll(),
'segments' => Segment::getSegmentsWithSubscriberCount(),
'styles' => FormRenderer::getStyles($form),
'date_types' => Block\Date::getDateTypes(),
'date_formats' => Block\Date::getDateFormats(),
'month_names' => Block\Date::getMonthNames(),
'sub_menu' => 'mailpoet-forms',
];
if ($this->featuresController->isSupported(FeaturesController::NEW_FORM_EDITOR)) {
$data['form']['styles'] = FormRenderer::getStyles($form);
$customFields = $this->customFieldsRepository->findAll();
$data['custom_fields'] = $this->customFieldsResponseBuilder->buildBatch($customFields);
$data['date_types'] = array_map(function ($label, $value) {
'date_types' => array_map(function ($label, $value) {
return [
'label' => $label,
'value' => $value,
];
}, $data['date_types'], array_keys($data['date_types']));
$this->pageRenderer->displayPage('form/editor.html', $data);
} else {
}, $dateTypes, array_keys($dateTypes)),
'date_formats' => Block\Date::getDateFormats(),
'month_names' => Block\Date::getMonthNames(),
'sub_menu' => 'mailpoet-forms',
'custom_fields' => $this->customFieldsResponseBuilder->buildBatch($customFields),
];
if (isset($_GET['legacy']) && (int)$_GET['legacy']) {
$data['date_types'] = $dateTypes;
$this->pageRenderer->displayPage('form/editor_legacy.html', $data);
} else {
$this->pageRenderer->displayPage('form/editor.html', $data);
}
}
}