From 6d2c2ec8f49325b13c86cabc97dcc93c2eb9db28 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Wed, 23 Dec 2020 15:32:16 +0100 Subject: [PATCH] Add field attribute support for `DateFormField` --- com.woltlab.wcf/templates/__dateFormField.tpl | 2 ++ .../files/acp/templates/__dateFormField.tpl | 2 ++ .../builder/field/DateFormField.class.php | 19 ++++++++++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/com.woltlab.wcf/templates/__dateFormField.tpl b/com.woltlab.wcf/templates/__dateFormField.tpl index 8a09c0013c..93e0817614 100644 --- a/com.woltlab.wcf/templates/__dateFormField.tpl +++ b/com.woltlab.wcf/templates/__dateFormField.tpl @@ -9,4 +9,6 @@ *}{if $field->isImmutable()} disabled{/if}{* *}{if $field->getEarliestDate() !== null} min="{$dateFormFieldEarliestDate}"{/if}{* *}{if $field->getLatestDate() !== null} max="{$dateFormFieldLatestDate}"{/if}{* + *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* + *}> diff --git a/wcfsetup/install/files/acp/templates/__dateFormField.tpl b/wcfsetup/install/files/acp/templates/__dateFormField.tpl index 8a09c0013c..93e0817614 100644 --- a/wcfsetup/install/files/acp/templates/__dateFormField.tpl +++ b/wcfsetup/install/files/acp/templates/__dateFormField.tpl @@ -9,4 +9,6 @@ *}{if $field->isImmutable()} disabled{/if}{* *}{if $field->getEarliestDate() !== null} min="{$dateFormFieldEarliestDate}"{/if}{* *}{if $field->getLatestDate() !== null} max="{$dateFormFieldLatestDate}"{/if}{* + *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{* + *}> diff --git a/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php index 78fd7c3b63..d7ef010612 100644 --- a/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php +++ b/wcfsetup/install/files/lib/system/form/builder/field/DateFormField.class.php @@ -13,7 +13,10 @@ use wcf\util\DateUtil; * @package WoltLabSuite\Core\System\Form\Builder\Field * @since 5.2 */ -class DateFormField extends AbstractFormField implements IAutoFocusFormField, ICssClassFormField, IImmutableFormField, INullableFormField { +class DateFormField extends AbstractFormField implements IAttributeFormField, IAutoFocusFormField, ICssClassFormField, IImmutableFormField, INullableFormField { + use TInputAttributeFormField { + getReservedFieldAttributes as private inputGetReservedFieldAttributes; + } use TAutoFocusFormField; use TCssClassFormField; use TImmutableFormField; @@ -418,4 +421,18 @@ class DateFormField extends AbstractFormField implements IAutoFocusFormField, IC return $this; } + + /** + * @inheritDoc + * @since 5.4 + */ + protected static function getReservedFieldAttributes(): array { + return array_merge( + static::inputGetReservedFieldAttributes(), + [ + 'max', + 'min', + ] + ); + } } -- 2.20.1