Compare commits

...

4 Commits
1.6.2 ... 1.6.4

Author SHA1 Message Date
53f2470bea v1.6.4 - more git issues 2020-02-24 17:08:09 +00:00
87241c1f87 v1.6.3 due to git mixup 2020-02-24 16:59:43 +00:00
2a1607c6d9 Merge branch 'master' of github.com:hoegrammer/opencase 2020-02-24 16:27:37 +00:00
e4a04a254d v1.6.1 2020-02-24 16:26:04 +00:00
3 changed files with 4 additions and 15 deletions

View File

@ -1,24 +1,13 @@
<?php <?php
function opencase_entities_update_8013() {
$update_manager = \Drupal::entityDefinitionUpdateManager();
$definition = $update_manager->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. * Add 'activity_date_time' field to 'oc_activity' entities.
*/ */
function opencase_entities_update_8003() { function opencase_entities_update_8003() {
$storage_definition = \Drupal\Core\Field\BaseFieldDefinition::create('datetime') $storage_definition = \Drupal\Core\Field\BaseFieldDefinition::create('datetime')
->setLabel(t('Date and time')) ->setLabel(t('Date and time'))
->setDescription(t('When the activity started.'))
->setRevisionable(TRUE) ->setRevisionable(TRUE)
->setDefaultValueCallback('Drupal\opencase_entities\Entity\OCActivity::currentDateTime') ->setDefaultValueCallback('\Drupal\opencase_entities\Entity\OCActivity::currentDateTime')
->setDisplayOptions('view', [ ->setDisplayOptions('view', [
'type' => 'datetime_default', 'type' => 'datetime_default',
'settings' => [ 'settings' => [

View File

@ -86,6 +86,7 @@ class OCActivity extends RevisionableContentEntityBase implements OCActivityInte
public static function currentDateTime() { public static function currentDateTime() {
$current_time = DrupalDateTime::createFromTimestamp(time()); $current_time = DrupalDateTime::createFromTimestamp(time());
$formatted = $current_time->format(DateTimeItem::DATETIME_STORAGE_FORMAT); $formatted = $current_time->format(DateTimeItem::DATETIME_STORAGE_FORMAT);
\Drupal::logger("nr_debug")->notice($formatted);
return $formatted; return $formatted;
} }
/** /**
@ -219,10 +220,9 @@ class OCActivity extends RevisionableContentEntityBase implements OCActivityInte
$fields['activity_date_time'] = BaseFieldDefinition::create('datetime') $fields['activity_date_time'] = BaseFieldDefinition::create('datetime')
->setLabel(t('Date and time')) ->setLabel(t('Date and time'))
->setDescription('')
->setRevisionable(TRUE) ->setRevisionable(TRUE)
->setRequired(TRUE) ->setRequired(TRUE)
->setDefaultValueCallback('Drupal\opencase_entities\Entity\OCActivity::currentDateTime') ->setDefaultValueCallback('\Drupal\opencase_entities\Entity\OCActivity::currentDateTime')
->setDisplayOptions('view', [ ->setDisplayOptions('view', [
'label' => 'above', 'label' => 'above',
'type' => 'datetime_default', 'type' => 'datetime_default',

View File

@ -2,7 +2,7 @@ name: 'OpenCase'
type: module type: module
description: 'Simple Case Management' description: 'Simple Case Management'
core: 8.x core: 8.x
version: 8.x-1.6.1 version: 8.x-1.6.4
package: 'OpenCase' package: 'OpenCase'
dependencies: dependencies:
- opencase_entities - opencase_entities