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

Use form id to identification error container

Browse Source 
[MAILPOET-3875]
This commit is contained in:
Jan Lysý
2021-12-02 14:09:04 +01:00
committed by Veljko V
parent 09c94577a9
commit f1d3135de0
10 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Form/Block/BlockRendererHelper.php
View File

@@ -26,7 +26,7 @@ class BlockRendererHelper {
$this->wp = $wp;
}
public function getInputValidation(array $block, array $extraRules = []): string {
public function getInputValidation(array $block, array $extraRules = [], ?int $formId = null): string {
$rules = [];
$blockId = $this->wp->escAttr($block['id']);
@@ -51,7 +51,7 @@ class BlockRendererHelper {
$rules['required'] = true;
$rules['mincheck'] = 1;
$rules['group'] = $blockId;
$rules['errors-container'] = '.mailpoet_error_' . $blockId;
$rules['errors-container'] = '.mailpoet_error_' . $blockId . ($formId ? '_' . $formId : '');
$rules['required-message'] = __('Please select a list.', 'mailpoet');
}
@@ -71,13 +71,13 @@ class BlockRendererHelper {
if (in_array($block['type'], ['radio', 'checkbox'])) {
$rules['group'] = 'custom_field_' . $blockId;
$rules['errors-container'] = '.mailpoet_error_' . $blockId;
$rules['errors-container'] = '.mailpoet_error_' . $blockId . ($formId ? '_' . $formId : '');
$rules['required-message'] = __('Please select at least one option.', 'mailpoet');
}
if ($block['type'] === 'date') {
$rules['group'] = 'custom_field_' . $blockId;
$rules['errors-container'] = '.mailpoet_error_' . $blockId;
$rules['errors-container'] = '.mailpoet_error_' . $blockId . ($formId ? '_' . $formId : '');
}
$validation = [];