From f47ded38facd3adc92aad2511b8674b50b172dce Mon Sep 17 00:00:00 2001 From: Naomi Date: Mon, 24 Feb 2020 10:57:06 +0000 Subject: [PATCH] v1.7 - adding datetime field with correct datepicker type & default datetime --- .../opencase_entities/opencase_entities.install | 15 +-------------- .../opencase_entities/src/Entity/OCActivity.php | 4 ---- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/modules/opencase_entities/opencase_entities.install b/modules/opencase_entities/opencase_entities.install index 4557a4a..9fb0966 100644 --- a/modules/opencase_entities/opencase_entities.install +++ b/modules/opencase_entities/opencase_entities.install @@ -1,15 +1,5 @@ getFieldStorageDefinition('activity_date_time', 'oc_activity'); - // $definition->setDescription(''); - // $definition->setRequired(''); - //->setDefaultValueCallback('Drupal\opencase_entities\Entity\OCActivity::currentDateTime') - $update_manager->updateFieldStorageDefinition($definition); -} - - /** * Add 'activity_date_time' field to 'oc_activity' entities. */ @@ -18,10 +8,7 @@ function opencase_entities_update_8003() { ->setLabel(t('Date and time')) ->setDescription(t('When the activity started.')) ->setRevisionable(TRUE) - ->setSettings([ - 'datetime_type' => 'date' - ]) - ->setDefaultValue('2000-01-01') + ->setDefaultValueCallback('Drupal\opencase_entities\Entity\OCActivity::currentDateTime') ->setDisplayOptions('view', [ 'type' => 'datetime_default', 'settings' => [ diff --git a/modules/opencase_entities/src/Entity/OCActivity.php b/modules/opencase_entities/src/Entity/OCActivity.php index 1695d9d..aa2a824 100644 --- a/modules/opencase_entities/src/Entity/OCActivity.php +++ b/modules/opencase_entities/src/Entity/OCActivity.php @@ -87,7 +87,6 @@ class OCActivity extends RevisionableContentEntityBase implements OCActivityInte $current_time = DrupalDateTime::createFromTimestamp(time()); $formatted = $current_time->format(DateTimeItem::DATETIME_STORAGE_FORMAT); \Drupal::logger("nr_debug")->notice($formatted); - $formatted="2010-10-10"; return $formatted; } /** @@ -224,9 +223,6 @@ class OCActivity extends RevisionableContentEntityBase implements OCActivityInte ->setDescription('') ->setRevisionable(TRUE) ->setRequired(TRUE) - ->setSettings([ - 'datetime_type' => 'date' - ]) ->setDefaultValueCallback('Drupal\opencase_entities\Entity\OCActivity::currentDateTime') ->setDisplayOptions('view', [ 'label' => 'above',