tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Consistent schema keys

Browse Source
This commit is contained in:
Ingo Schommer 2017-04-27 11:47:04 +12:00
parent 14b3468eee
commit b852a76334
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Forms/DateField.php
View File

@ -295,7 +295,11 @@ class DateField extends TextField
$defaults = parent::getSchemaDataDefaults(); $defaults = parent::getSchemaDataDefaults();
return array_merge($defaults, [ return array_merge($defaults, [
'lang' => i18n::convert_rfc1766($this->getLocale()), 'lang' => i18n::convert_rfc1766($this->getLocale()),
'html5' => $this->getHTML5() 'data' => array_merge($defaults['data'], [
'html5' => $this->getHTML5(),
'min' => $this->getMinDate(),
'max' => $this->getMaxDate()
])
]); ]);
} }

7
src/Forms/DatetimeField.php
View File

@ -111,7 +111,12 @@ class DatetimeField extends TextField
{ {
$defaults = parent::getSchemaDataDefaults(); $defaults = parent::getSchemaDataDefaults();
return array_merge($defaults, [ return array_merge($defaults, [
'html5' => $this->getHTML5() 'lang' => i18n::convert_rfc1766($this->getLocale()),
'data' => array_merge($defaults['data'], [
'html5' => $this->getHTML5(),
'min' => $this->getMinDate(),
'max' => $this->getMaxDate()
])
]); ]);
} }

5
src/Forms/TimeField.php
View File

@ -235,7 +235,10 @@ class TimeField extends TextField
{ {
$defaults = parent::getSchemaDataDefaults(); $defaults = parent::getSchemaDataDefaults();
return array_merge($defaults, [ return array_merge($defaults, [
'html5' => $this->getHTML5() 'lang' => i18n::convert_rfc1766($this->getLocale()),
'data' => array_merge($defaults['data'], [
'html5' => $this->getHTML5(),
])
]); ]);
} }