Merge branch 'master' of ssh://git.autonomic.zone:2222/autonomic-cooperative/opencase into trav

This commit is contained in:
autonomic 2021-11-29 20:13:19 +01:00
commit 042e5853bb
23 changed files with 39 additions and 30 deletions

View File

@ -1,7 +1,7 @@
name: 'Opencase Cases' name: 'Opencase Cases'
type: module type: module
description: 'Provides case entities and a required field on activities linking them to a case.' description: 'Provides case entities and a required field on activities linking them to a case.'
core: 8.x core_version_requirement: 9.x
package: OpenCase package: OpenCase
dependencies: dependencies:
0: opencase_entities 0: opencase_entities

View File

@ -29,8 +29,6 @@ delete all case provision revisions:
title: 'Delete all revisions' title: 'Delete all revisions'
description: 'Role requires permission to <em>view Case Provision revisions</em> and <em>delete rights</em> for case provision entities in question or <em>administer case provision entities</em>.' description: 'Role requires permission to <em>view Case Provision revisions</em> and <em>delete rights</em> for case provision entities in question or <em>administer case provision entities</em>.'
permission_callbacks:
- \Drupal\opencase_cases\OCCaseProvisionPermissions::generatePermissions
add case fee entities: add case fee entities:
title: 'Create new Case Fee entities' title: 'Create new Case Fee entities'
@ -64,3 +62,4 @@ delete all case fee revisions:
permission_callbacks: permission_callbacks:
- \Drupal\opencase_cases\OCCaseFeePermissions::generatePermissions - \Drupal\opencase_cases\OCCaseFeePermissions::generatePermissions
- \Drupal\opencase_cases\OCCaseProvisionPermissions::generatePermissions

View File

@ -55,6 +55,11 @@ use Drupal\user\UserInterface;
* "langcode" = "langcode", * "langcode" = "langcode",
* "published" = "status", * "published" = "status",
* }, * },
* revision_metadata_keys = {
* "revision_user" = "revision_user",
* "revision_created" = "revision_created",
* "revision_log_message" = "revision_log",
* },
* links = { * links = {
* "canonical" = "/opencase/oc_case_fee/{oc_case_fee}", * "canonical" = "/opencase/oc_case_fee/{oc_case_fee}",
* "add-page" = "/opencase/oc_case_fee/add", * "add-page" = "/opencase/oc_case_fee/add",

View File

@ -55,6 +55,11 @@ use Drupal\user\UserInterface;
* "langcode" = "langcode", * "langcode" = "langcode",
* "published" = "status", * "published" = "status",
* }, * },
* revision_metadata_keys = {
* "revision_user" = "revision_user",
* "revision_created" = "revision_created",
* "revision_log_message" = "revision_log",
* },
* links = { * links = {
* "canonical" = "/opencase/oc_case_provision/{oc_case_provision}", * "canonical" = "/opencase/oc_case_provision/{oc_case_provision}",
* "add-page" = "/opencase/oc_case_provision/add", * "add-page" = "/opencase/oc_case_provision/add",

View File

@ -107,7 +107,7 @@ class OCCaseRevisionDeleteForm extends ConfirmFormBase {
$this->OCCaseStorage->deleteRevision($this->revision->getRevisionId()); $this->OCCaseStorage->deleteRevision($this->revision->getRevisionId());
$this->logger('content')->notice('Case: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]); $this->logger('content')->notice('Case: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
drupal_set_message(t('Revision from %revision-date of Case %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()])); \Drupal::messenger()->addMessage(t('Revision from %revision-date of Case %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
$form_state->setRedirect( $form_state->setRedirect(
'entity.oc_case.canonical', 'entity.oc_case.canonical',
['oc_case' => $this->revision->id()] ['oc_case' => $this->revision->id()]

View File

@ -120,7 +120,7 @@ class OCCaseRevisionRevertForm extends ConfirmFormBase {
$this->revision->save(); $this->revision->save();
$this->logger('content')->notice('Case: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]); $this->logger('content')->notice('Case: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
drupal_set_message(t('Case %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)])); \Drupal::messenger()->addMessage(t('Case %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
$form_state->setRedirect( $form_state->setRedirect(
'entity.oc_case.version_history', 'entity.oc_case.version_history',
['oc_case' => $this->revision->id()] ['oc_case' => $this->revision->id()]

View File

@ -38,7 +38,7 @@ class OCCaseTypeDeleteForm extends EntityConfirmFormBase {
public function submitForm(array &$form, FormStateInterface $form_state) { public function submitForm(array &$form, FormStateInterface $form_state) {
$this->entity->delete(); $this->entity->delete();
drupal_set_message( \Drupal::messenger()->addMessage(
$this->t('content @type: deleted @label.', $this->t('content @type: deleted @label.',
[ [
'@type' => $this->entity->bundle(), '@type' => $this->entity->bundle(),

View File

@ -49,13 +49,13 @@ class OCCaseTypeForm extends EntityForm {
switch ($status) { switch ($status) {
case SAVED_NEW: case SAVED_NEW:
drupal_set_message($this->t('Created the %label Case type.', [ \Drupal::messenger()->addMessage($this->t('Created the %label Case type.', [
'%label' => $oc_case_type->label(), '%label' => $oc_case_type->label(),
])); ]));
break; break;
default: default:
drupal_set_message($this->t('Saved the %label Case type.', [ \Drupal::messenger()->addMessage($this->t('Saved the %label Case type.', [
'%label' => $oc_case_type->label(), '%label' => $oc_case_type->label(),
])); ]));
} }

View File

@ -1,5 +1,5 @@
name: 'OpenCase Entities' name: 'OpenCase Entities'
type: module type: module
description: 'Entity Types for OpenCase' description: 'Entity Types for OpenCase'
core: 8.x core_version_requirement: 9.x
package: 'OpenCase' package: 'OpenCase'

View File

@ -55,19 +55,19 @@ class OCActivityForm extends ContentEntityForm {
switch ($status) { switch ($status) {
case SAVED_NEW: case SAVED_NEW:
drupal_set_message($this->t('Created the %bundle.', [ \Drupal::messenger()->addMessage($this->t('Created the %bundle.', [
'%bundle' => $entity->bundle(), '%bundle' => $entity->bundle(),
])); ]));
break; break;
default: default:
drupal_set_message($this->t('Saved the %bundle.', [ \Drupal::messenger()->addMessage($this->t('Saved the %bundle.', [
'%bundle' => $entity->bundle(), '%bundle' => $entity->bundle(),
])); ]));
} }
// If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied". // 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 activity entities')) { if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished activity entities')) {
drupal_set_message($this->t('The %bundle is now unpublished & hidden from you.', [ \Drupal::messenger()->addMessage($this->t('The %bundle is now unpublished & hidden from you.', [
'%bundle' => $entity->bundle(), '%bundle' => $entity->bundle(),
])); ]));
$form_state->setRedirect('<front>'); $form_state->setRedirect('<front>');

View File

@ -107,7 +107,7 @@ class OCActivityRevisionDeleteForm extends ConfirmFormBase {
$this->OCActivityStorage->deleteRevision($this->revision->getRevisionId()); $this->OCActivityStorage->deleteRevision($this->revision->getRevisionId());
$this->logger('content')->notice('Activity: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]); $this->logger('content')->notice('Activity: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
drupal_set_message(t('Revision from %revision-date of Activity %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()])); \Drupal::messenger()->addMessage(t('Revision from %revision-date of Activity %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
$form_state->setRedirect( $form_state->setRedirect(
'entity.oc_activity.canonical', 'entity.oc_activity.canonical',
['oc_activity' => $this->revision->id()] ['oc_activity' => $this->revision->id()]

View File

@ -120,7 +120,7 @@ class OCActivityRevisionRevertForm extends ConfirmFormBase {
$this->revision->save(); $this->revision->save();
$this->logger('content')->notice('Activity: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]); $this->logger('content')->notice('Activity: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
drupal_set_message(t('Activity %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)])); \Drupal::messenger()->addMessage(t('Activity %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
$form_state->setRedirect( $form_state->setRedirect(
'entity.oc_activity.version_history', 'entity.oc_activity.version_history',
['oc_activity' => $this->revision->id()] ['oc_activity' => $this->revision->id()]

View File

@ -38,7 +38,7 @@ class OCActivityTypeDeleteForm extends EntityConfirmFormBase {
public function submitForm(array &$form, FormStateInterface $form_state) { public function submitForm(array &$form, FormStateInterface $form_state) {
$this->entity->delete(); $this->entity->delete();
drupal_set_message( \Drupal::messenger()->addMessage(
$this->t('content @type: deleted @label.', $this->t('content @type: deleted @label.',
[ [
'@type' => $this->entity->bundle(), '@type' => $this->entity->bundle(),

View File

@ -49,13 +49,13 @@ class OCActivityTypeForm extends EntityForm {
switch ($status) { switch ($status) {
case SAVED_NEW: case SAVED_NEW:
drupal_set_message($this->t('Created the %label Activity type.', [ \Drupal::messenger()->addMessage($this->t('Created the %label Activity type.', [
'%label' => $oc_activity_type->label(), '%label' => $oc_activity_type->label(),
])); ]));
break; break;
default: default:
drupal_set_message($this->t('Saved the %label Activity type.', [ \Drupal::messenger()->addMessage($this->t('Saved the %label Activity type.', [
'%label' => $oc_activity_type->label(), '%label' => $oc_activity_type->label(),
])); ]));
} }

View File

@ -48,19 +48,19 @@ class OCActorForm extends ContentEntityForm {
switch ($status) { switch ($status) {
case SAVED_NEW: case SAVED_NEW:
drupal_set_message($this->t('Created %label.', [ \Drupal::messenger()->addMessage($this->t('Created %label.', [
'%label' => $entity->label(), '%label' => $entity->label(),
])); ]));
break; break;
default: default:
drupal_set_message($this->t('Saved %label.', [ \Drupal::messenger()->addMessage($this->t('Saved %label.', [
'%label' => $entity->label(), '%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 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 actor entities')) { if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished actor 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(), '%label' => $entity->label(),
])); ]));
$form_state->setRedirect('<front>'); $form_state->setRedirect('<front>');

View File

@ -107,7 +107,7 @@ class OCActorRevisionDeleteForm extends ConfirmFormBase {
$this->OCActorStorage->deleteRevision($this->revision->getRevisionId()); $this->OCActorStorage->deleteRevision($this->revision->getRevisionId());
$this->logger('content')->notice('Actor: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]); $this->logger('content')->notice('Actor: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
drupal_set_message(t('Revision from %revision-date of Actor %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()])); \Drupal::messenger()->addMessage(t('Revision from %revision-date of Actor %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
$form_state->setRedirect( $form_state->setRedirect(
'entity.oc_actor.canonical', 'entity.oc_actor.canonical',
['oc_actor' => $this->revision->id()] ['oc_actor' => $this->revision->id()]

View File

@ -120,7 +120,7 @@ class OCActorRevisionRevertForm extends ConfirmFormBase {
$this->revision->save(); $this->revision->save();
$this->logger('content')->notice('Actor: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]); $this->logger('content')->notice('Actor: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
drupal_set_message(t('Actor %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)])); \Drupal::messenger()->addMessage(t('Actor %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
$form_state->setRedirect( $form_state->setRedirect(
'entity.oc_actor.version_history', 'entity.oc_actor.version_history',
['oc_actor' => $this->revision->id()] ['oc_actor' => $this->revision->id()]

View File

@ -38,7 +38,7 @@ class OCActorTypeDeleteForm extends EntityConfirmFormBase {
public function submitForm(array &$form, FormStateInterface $form_state) { public function submitForm(array &$form, FormStateInterface $form_state) {
$this->entity->delete(); $this->entity->delete();
drupal_set_message( \Drupal::messenger()->addMessage(
$this->t('content @type: deleted @label.', $this->t('content @type: deleted @label.',
[ [
'@type' => $this->entity->bundle(), '@type' => $this->entity->bundle(),

View File

@ -49,13 +49,13 @@ class OCActorTypeForm extends EntityForm {
switch ($status) { switch ($status) {
case SAVED_NEW: case SAVED_NEW:
drupal_set_message($this->t('Created the %label Person type.', [ \Drupal::messenger()->addMessage($this->t('Created the %label Person type.', [
'%label' => $oc_actor_type->label(), '%label' => $oc_actor_type->label(),
])); ]));
break; break;
default: default:
drupal_set_message($this->t('Saved the %label Person type.', [ \Drupal::messenger()->addMessage($this->t('Saved the %label Person type.', [
'%label' => $oc_actor_type->label(), '%label' => $oc_actor_type->label(),
])); ]));
} }

View File

@ -62,7 +62,7 @@ class OCEventForm extends ContentEntityForm {
} }
// If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied". // 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 event entities')) { if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished event 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(), '%label' => $entity->label(),
])); ]));
$form_state->setRedirect('<front>'); $form_state->setRedirect('<front>');

View File

@ -83,7 +83,7 @@ class OCOrganisationForm extends ContentEntityForm {
} }
// If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied". // 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 organisation entities')) { if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished organisation 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(), '%label' => $entity->label(),
])); ]));
$form_state->setRedirect('<front>'); $form_state->setRedirect('<front>');

View File

@ -1,7 +1,7 @@
name: 'OpenCase Search' name: 'OpenCase Search'
type: module type: module
description: 'Search functionality for OpenCase' description: 'Search functionality for OpenCase'
core: 8.x core_version_requirement: 9.x
package: 'OpenCase' package: 'OpenCase'
dependencies: dependencies:
- search_api - search_api

View File

@ -1,8 +1,8 @@
name: 'OpenCase' name: 'OpenCase'
type: module type: module
description: 'Simple Case Management' description: 'Simple Case Management'
core: 8.x core_version_requirement: 9.x
version: 8.x-3.0 version: 9.x-1.0
package: 'OpenCase' package: 'OpenCase'
dependencies: dependencies:
- opencase_entities - opencase_entities