diff --git a/core/lib/Drupal/Core/Datetime/Plugin/Field/FieldWidget/TimestampDatetimeWidget.php b/core/lib/Drupal/Core/Datetime/Plugin/Field/FieldWidget/TimestampDatetimeWidget.php index af3fd0dcee2135e3e8a4d1d2c797379f85ed6621..88efd5efe46ff501459ab871d58f90d13f1515c9 100644 --- a/core/lib/Drupal/Core/Datetime/Plugin/Field/FieldWidget/TimestampDatetimeWidget.php +++ b/core/lib/Drupal/Core/Datetime/Plugin/Field/FieldWidget/TimestampDatetimeWidget.php @@ -25,8 +25,7 @@ class TimestampDatetimeWidget extends WidgetBase { * {@inheritdoc} */ public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { - $parent_entity = $items->getParent()->getValue(); - $default_value = (!$parent_entity->isNew() && isset($items[$delta]->value)) ? DrupalDateTime::createFromTimestamp($items[$delta]->value) : ''; + $default_value = isset($items[$delta]->value) ? DrupalDateTime::createFromTimestamp($items[$delta]->value) : ''; $element['value'] = $element + [ '#type' => 'datetime', '#default_value' => $default_value, diff --git a/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php b/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php index a854f48de91988535ed498edf8b1b6e2fe088829..81383c79f57a7f9708d924d639a2d4ddd7e6bd0a 100644 --- a/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php +++ b/core/tests/Drupal/FunctionalTests/Datetime/TimestampTest.php @@ -154,6 +154,25 @@ public function testWidget() { $medium = DateFormat::load('medium')->getPattern(); $this->drupalGet('entity_test/' . $id); $this->assertSession()->pageTextContains($date->format($medium)); + + // Build up a date in the UTC timezone. + $value = '2024-01-16 00:00:00'; + $date = new DrupalDateTime($value, 'UTC'); + + // Set a default value for the field. + $this->field->setDefaultValue($date->getTimestamp())->save(); + + // Update the timezone to the system default. + $date->setTimezone(timezone_open(date_default_timezone_get())); + + $this->drupalGet('entity_test/add'); + $date_format = DateFormat::load('html_date')->getPattern(); + $time_format = DateFormat::load('html_time')->getPattern(); + // Make sure the default field value is set as the default value in the widget. + $this->assertSession()->fieldExists('field_timestamp[0][value][date]'); + $this->assertSession()->fieldValueEquals('field_timestamp[0][value][date]', $date->format($date_format)); + $this->assertSession()->fieldExists('field_timestamp[0][value][time]'); + $this->assertSession()->fieldValueEquals('field_timestamp[0][value][time]', $date->format($time_format)); } }