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

Fix today preselect in date field

Browse Source 
[MAILPOET-2652]
This commit is contained in:
Pavel Dohnal
2020-01-23 14:42:09 +01:00
committed by Jack Kitterhing
parent 95ca1533ec
commit b77447103c
1 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/Form/Block/Date.php
View File

@@ -36,40 +36,8 @@ class Date extends Base {
// generate an array of selectors based on date format // generate an array of selectors based on date format
$dateSelectors = explode('/', $dateFormat); $dateSelectors = explode('/', $dateFormat);
// format value if present
$value = self::getFieldValue($block);
$day = null;
$month = null;
$year = null;
if (strlen(trim($value)) > 0) {
$value = explode('-', $value);
switch ($block['params']['date_type']) {
case 'year_month_day':
$year = (isset($value[0]) ? (int)$value[0] : null);
$month = (isset($value[1]) ? (int)$value[1] : null);
$day = (isset($value[2]) ? (int)$value[2] : null);
break;
case 'year_month':
$year = (isset($value[0]) ? (int)$value[0] : null);
$month = (isset($value[1]) ? (int)$value[1] : null);
break;
case 'month':
$month = (isset($value[0]) ? (int)$value[0] : null);
break;
case 'year':
$year = (isset($value[0]) ? (int)$value[0] : null);
break;
}
}
foreach ($dateSelectors as $dateSelector) { foreach ($dateSelectors as $dateSelector) {
if ($dateSelector === 'DD') { if ($dateSelector === 'DD') {
$block['selected'] = $day;
$html .= '<select class="mailpoet_date_day" '; $html .= '<select class="mailpoet_date_day" ';
$html .= static::getInputValidation($block, [ $html .= static::getInputValidation($block, [
'required-message' => WPFunctions::get()->__('Please select a day', 'mailpoet'), 'required-message' => WPFunctions::get()->__('Please select a day', 'mailpoet'),
@@ -78,7 +46,6 @@ class Date extends Base {
$html .= static::getDays($block); $html .= static::getDays($block);
$html .= '</select>'; $html .= '</select>';
} else if ($dateSelector === 'MM') { } else if ($dateSelector === 'MM') {
$block['selected'] = $month;
$html .= '<select class="mailpoet_select mailpoet_date_month" '; $html .= '<select class="mailpoet_select mailpoet_date_month" ';
$html .= static::getInputValidation($block, [ $html .= static::getInputValidation($block, [
'required-message' => WPFunctions::get()->__('Please select a month', 'mailpoet'), 'required-message' => WPFunctions::get()->__('Please select a month', 'mailpoet'),
@@ -87,7 +54,6 @@ class Date extends Base {
$html .= static::getMonths($block); $html .= static::getMonths($block);
$html .= '</select>'; $html .= '</select>';
} else if ($dateSelector === 'YYYY') { } else if ($dateSelector === 'YYYY') {
$block['selected'] = $year;
$html .= '<select class="mailpoet_date_year" '; $html .= '<select class="mailpoet_date_year" ';
$html .= static::getInputValidation($block, [ $html .= static::getInputValidation($block, [
'required-message' => WPFunctions::get()->__('Please select a year', 'mailpoet'), 'required-message' => WPFunctions::get()->__('Please select a year', 'mailpoet'),
@@ -132,6 +98,10 @@ class Date extends Base {
'selected' => null, 'selected' => null,
]; ];
// is default today
if (!empty($block['params']['is_default_today'])) {
$defaults['selected'] = (int)strftime('%m');
}
// merge block with defaults // merge block with defaults
$block = array_merge($defaults, $block); $block = array_merge($defaults, $block);