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

Split sending pages to form editor

Browse Source 
[MAILPOET-3120]
This commit is contained in:
Pavel Dohnal
2020-09-09 12:27:39 +02:00
committed by Veljko V
parent 63bf267180
commit bbde9cf36d
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/js/src/form_editor/store/map_form_data_after_loading.jsx
View File

@ -135,7 +135,6 @@ export default function mapFormDataAfterLoading(data) {
backgroundImageUrl: data.settings.background_image_url, backgroundImageUrl: data.settings.background_image_url,
backgroundImageDisplay: data.settings.background_image_display, backgroundImageDisplay: data.settings.background_image_display,
closeButton: data.settings.close_button ?? defaults.formStyles.closeButton, closeButton: data.settings.close_button ?? defaults.formStyles.closeButton,
}, },
}; };

10
assets/js/src/form_editor/store/selectors.jsx
View File

@ -44,7 +44,15 @@ export default {
return state.customFields; return state.customFields;
}, },
getAllAvailablePages(state) { getAllAvailablePages(state) {
return state.pages; const allWPPages = state.allWpPages.map((page) => ({
id: page.id,
title: page.name,
}));
const mailpoetPages = state.mailpoetPages.map((page) => ({
id: page.ID,
title: page.post_title,
}));
return mailpoetPages.concat(allWPPages);
}, },
getIsFormSaving(state) { getIsFormSaving(state) {
return state.isFormSaving; return state.isFormSaving;

2
assets/js/src/form_editor/store/store.jsx
View File

@ -51,7 +51,7 @@ export default () => {
formErrors: validateForm(formData, formBlocks), formErrors: validateForm(formData, formBlocks),
segments: window.mailpoet_form_segments, segments: window.mailpoet_form_segments,
customFields, customFields,
pages: window.mailpoet_form_pages, mailpoetPages: window.mailpoet_pages,
isFormSaving: false, isFormSaving: false,
isCustomFieldSaving: false, isCustomFieldSaving: false,
isCustomFieldCreating: false, isCustomFieldCreating: false,

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

@ -154,7 +154,7 @@ class FormEditor {
'iframe' => Export::get('iframe', $form), 'iframe' => Export::get('iframe', $form),
'shortcode' => Export::get('shortcode', $form), 'shortcode' => Export::get('shortcode', $form),
], ],
'mailpoet_pages' => Pages::getAll(), 'mailpoet_pages' => Pages::getMailPoetPages(),
'segments' => Segment::getSegmentsWithSubscriberCount(), 'segments' => Segment::getSegmentsWithSubscriberCount(),
'styles' => $this->formRenderer->getCustomStyles($form), 'styles' => $this->formRenderer->getCustomStyles($form),
'date_types' => array_map(function ($label, $value) { 'date_types' => array_map(function ($label, $value) {

2
views/form/editor.html
View File

@ -23,7 +23,7 @@
var mailpoet_form_data = <%= json_encode(form) %>; var mailpoet_form_data = <%= json_encode(form) %>;
var mailpoet_form_exports = <%= json_encode(form_exports) %>; var mailpoet_form_exports = <%= json_encode(form_exports) %>;
var mailpoet_form_segments = <%= json_encode(segments) %>; var mailpoet_form_segments = <%= json_encode(segments) %>;
var mailpoet_form_pages = <%= json_encode(mailpoet_pages) %>; var mailpoet_pages = <%= json_encode(mailpoet_pages) %>;
var mailpoet_custom_fields = <%= json_encode(custom_fields) %>; var mailpoet_custom_fields = <%= json_encode(custom_fields) %>;
var mailpoet_date_types = <%= json_encode(date_types) %>; var mailpoet_date_types = <%= json_encode(date_types) %>;
var mailpoet_date_formats = <%= json_encode(date_formats) %>; var mailpoet_date_formats = <%= json_encode(date_formats) %>;