Update to Drupal 8.0.0-beta15. For more information, see: https://www.drupal.org/node/2563023
This commit is contained in:
parent
2720a9ec4b
commit
f3791f1da3
1898 changed files with 54300 additions and 11481 deletions
|
|
@ -40,8 +40,15 @@ class DateTimeDatelistWidget extends DateTimeWidgetBase {
|
|||
$element = parent::formElement($items, $delta, $element, $form, $form_state);
|
||||
|
||||
$date_order = $this->getSetting('date_order');
|
||||
$time_type = $this->getSetting('time_type');
|
||||
$increment = $this->getSetting('increment');
|
||||
|
||||
if ($this->getFieldSetting('datetime_type') == 'datetime') {
|
||||
$time_type = $this->getSetting('time_type');
|
||||
$increment = $this->getSetting('increment');
|
||||
}
|
||||
else {
|
||||
$time_type = '';
|
||||
$increment = '';
|
||||
}
|
||||
|
||||
// Set up the date part order array.
|
||||
switch ($date_order) {
|
||||
|
|
@ -99,25 +106,31 @@ class DateTimeDatelistWidget extends DateTimeWidgetBase {
|
|||
'#default_value' => $this->getSetting('time_type'),
|
||||
'#options' => array('24' => t('24 hour time'), '12' => t('12 hour time')),
|
||||
);
|
||||
|
||||
$element['increment'] = [
|
||||
'#type' => 'select',
|
||||
'#title' => t('Time increments'),
|
||||
'#default_value' => $this->getSetting('increment'),
|
||||
'#options' => [
|
||||
1 => t('1 minute'),
|
||||
5 => t('5 minute'),
|
||||
10 => t('10 minute'),
|
||||
15 => t('15 minute'),
|
||||
30 => t('30 minute'),
|
||||
],
|
||||
];
|
||||
}
|
||||
else {
|
||||
$element['time_type'] = array(
|
||||
'#type' => 'hidden',
|
||||
'#value' => 'none',
|
||||
);
|
||||
}
|
||||
|
||||
$element['increment'] = array(
|
||||
'#type' => 'select',
|
||||
'#title' => t('Time increments'),
|
||||
'#default_value' => $this->getSetting('increment'),
|
||||
'#options' => array(
|
||||
1 => t('1 minute'),
|
||||
5 => t('5 minute'),
|
||||
10 => t('10 minute'),
|
||||
15 => t('15 minute'),
|
||||
30 => t('30 minute')),
|
||||
);
|
||||
$element['increment'] = [
|
||||
'#type' => 'hidden',
|
||||
'#value' => $this->getSetting('increment'),
|
||||
];
|
||||
}
|
||||
|
||||
return $element;
|
||||
}
|
||||
|
|
@ -131,8 +144,8 @@ class DateTimeDatelistWidget extends DateTimeWidgetBase {
|
|||
$summary[] = t('Date part order: !order', array('!order' => $this->getSetting('date_order')));
|
||||
if ($this->getFieldSetting('datetime_type') == 'datetime') {
|
||||
$summary[] = t('Time type: !time_type', array('!time_type' => $this->getSetting('time_type')));
|
||||
$summary[] = t('Time increments: !increment', array('!increment' => $this->getSetting('increment')));
|
||||
}
|
||||
$summary[] = t('Time increments: !increment', array('!increment' => $this->getSetting('increment')));
|
||||
|
||||
return $summary;
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue