From c19b7d4be83fc3ee67d2ea3e60d117c27d364a15 Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 23 Oct 2021 18:18:41 +0100 Subject: [PATCH] upgraded to drupal 9 --- modules/opencase_cases/src/Entity/OCCase.php | 5 +++++ modules/opencase_cases/src/Form/OCCaseForm.php | 8 ++++---- modules/opencase_entities/src/Entity/OCActivity.php | 5 +++++ modules/opencase_entities/src/Entity/OCActor.php | 5 +++++ modules/opencase_entities/src/Entity/OCOrganisation.php | 5 +++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/modules/opencase_cases/src/Entity/OCCase.php b/modules/opencase_cases/src/Entity/OCCase.php index 483e41f..5fcd5d4 100644 --- a/modules/opencase_cases/src/Entity/OCCase.php +++ b/modules/opencase_cases/src/Entity/OCCase.php @@ -41,6 +41,11 @@ use Drupal\user\UserInterface; * data_table = "oc_case_field_data", * revision_table = "oc_case_revision", * revision_data_table = "oc_case_field_revision", + * revision_metadata_keys = { + * "revision_user" = "revision_user", + * "revision_created" = "revision_created", + * "revision_log_message" = "revision_log" + * }, * translatable = TRUE, * admin_permission = "administer case entities", * entity_keys = { diff --git a/modules/opencase_cases/src/Form/OCCaseForm.php b/modules/opencase_cases/src/Form/OCCaseForm.php index 6b76bdd..429a8cf 100644 --- a/modules/opencase_cases/src/Form/OCCaseForm.php +++ b/modules/opencase_cases/src/Form/OCCaseForm.php @@ -44,7 +44,7 @@ class OCCaseForm extends ContentEntityForm { $entity->setNewRevision(); // If a new revision is created, save the current user as revision author. - $entity->setRevisionCreationTime(REQUEST_TIME); + $entity->setRevisionCreationTime( \Drupal::time()->getRequestTime()); $entity->setRevisionUserId(\Drupal::currentUser()->id()); } else { @@ -55,19 +55,19 @@ class OCCaseForm extends ContentEntityForm { switch ($status) { case SAVED_NEW: - drupal_set_message($this->t('Created the %label Case.', [ + \Drupal::messenger()->addMessage($this->t('Created the %label Case.', [ '%label' => $entity->label(), ])); break; default: - drupal_set_message($this->t('Saved the %label Case.', [ + \Drupal::messenger()->addMessage($this->t('Saved the %label Case.', [ '%label' => $entity->label(), ])); } // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied". if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished case entities')) { - drupal_set_message($this->t('The record for "%label" is now unpublished & hidden from you.', [ + \Drupal::messenger()->addMessage($this->t('The record for "%label" is now unpublished & hidden from you.', [ '%label' => $entity->label(), ])); $form_state->setRedirect(''); diff --git a/modules/opencase_entities/src/Entity/OCActivity.php b/modules/opencase_entities/src/Entity/OCActivity.php index c674323..c785bb4 100644 --- a/modules/opencase_entities/src/Entity/OCActivity.php +++ b/modules/opencase_entities/src/Entity/OCActivity.php @@ -43,6 +43,11 @@ use Drupal\Core\Datetime\DrupalDateTime; * data_table = "oc_activity_field_data", * revision_table = "oc_activity_revision", * revision_data_table = "oc_activity_field_revision", + * revision_metadata_keys = { + * "revision_user" = "revision_user", + * "revision_created" = "revision_created", + * "revision_log_message" = "revision_log" + * }, * translatable = TRUE, * admin_permission = "administer activity entities", * entity_keys = { diff --git a/modules/opencase_entities/src/Entity/OCActor.php b/modules/opencase_entities/src/Entity/OCActor.php index ba2adbd..a916f15 100644 --- a/modules/opencase_entities/src/Entity/OCActor.php +++ b/modules/opencase_entities/src/Entity/OCActor.php @@ -41,6 +41,11 @@ use Drupal\user\UserInterface; * data_table = "oc_actor_field_data", * revision_table = "oc_actor_revision", * revision_data_table = "oc_actor_field_revision", + * revision_metadata_keys = { + * "revision_user" = "revision_user", + * "revision_created" = "revision_created", + * "revision_log_message" = "revision_log" + * }, * translatable = TRUE, * admin_permission = "administer actor entities", * entity_keys = { diff --git a/modules/opencase_entities/src/Entity/OCOrganisation.php b/modules/opencase_entities/src/Entity/OCOrganisation.php index 9e1bf21..4456d04 100644 --- a/modules/opencase_entities/src/Entity/OCOrganisation.php +++ b/modules/opencase_entities/src/Entity/OCOrganisation.php @@ -42,6 +42,11 @@ use Drupal\user\UserInterface; * data_table = "oc_organisation_field_data", * revision_table = "oc_organisation_revision", * revision_data_table = "oc_organisation_field_revision", + * revision_metadata_keys = { + * "revision_user" = "revision_user", + * "revision_created" = "revision_created", + * "revision_log_message" = "revision_log" + * }, * translatable = TRUE, * permission_granularity = "bundle", * admin_permission = "administer organisation entities",