tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pass setDescription() through to sub-fields in DatetimeField and PhoneNumberField

This commit is contained in:
Ingo Schommer 2012-11-30 12:10:09 +01:00
parent dbaf407569
commit 212c427c45
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
forms/DatetimeField.php
View File

@ -87,7 +87,7 @@ class DatetimeField extends FormField {
public function Field($properties = array()) {
Requirements::css(FRAMEWORK_DIR . '/css/DatetimeField.css');
$tzField = ($this->getConfig('usertimezone')) ? $this->timezoneField->FieldHolder() : '';
return $this->dateField->FieldHolder() .
$this->timeField->FieldHolder() .
@ -236,6 +236,15 @@ class DatetimeField extends FormField {
public function getLocale() {
return $this->dateField->getLocale();
}
public function setDescription($description) {
parent::setDescription($description);
$this->dateField->setDescription($description);
$this->timeField->setDescription($description);
return $this;
}
/**
* Note: Use {@link getDateField()} and {@link getTimeField()}

3
forms/PhoneNumberField.php
View File

@ -54,6 +54,9 @@ class PhoneNumberField extends FormField {
$field->push(new NumericField( $this->name.'[Extension]', 'ext', $extension, 6));
}
$description = $this->getDescription();
if($description) $fields->getChildren()->First()->setDescription($description);
foreach($fields as $field) {
$field->setDisabled($this->isDisabled());
$field->setReadonly($this->isReadonly());