diff --git a/modules/opencase_cases/src/Form/OCCaseForm.php b/modules/opencase_cases/src/Form/OCCaseForm.php index 20269a3..6b76bdd 100644 --- a/modules/opencase_cases/src/Form/OCCaseForm.php +++ b/modules/opencase_cases/src/Form/OCCaseForm.php @@ -65,7 +65,15 @@ class OCCaseForm extends ContentEntityForm { '%label' => $entity->label(), ])); } - $form_state->setRedirect('entity.oc_case.canonical', ['oc_case' => $entity->id()]); + // 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.', [ + '%label' => $entity->label(), + ])); + $form_state->setRedirect(''); + } else { + $form_state->setRedirect('entity.oc_case.canonical', ['oc_case' => $entity->id()]); + } } } diff --git a/modules/opencase_entities/src/Form/OCActivityForm.php b/modules/opencase_entities/src/Form/OCActivityForm.php index 6480abe..b6fa492 100644 --- a/modules/opencase_entities/src/Form/OCActivityForm.php +++ b/modules/opencase_entities/src/Form/OCActivityForm.php @@ -55,17 +55,25 @@ class OCActivityForm extends ContentEntityForm { switch ($status) { case SAVED_NEW: - drupal_set_message($this->t('Created the %label Activity.', [ - '%label' => $entity->label(), + drupal_set_message($this->t('Created the %bundle.', [ + '%bundle' => $entity->bundle(), ])); break; default: - drupal_set_message($this->t('Saved the %label Activity.', [ - '%label' => $entity->label(), + drupal_set_message($this->t('Saved the %bundle.', [ + '%bundle' => $entity->bundle(), ])); } - $form_state->setRedirect('entity.oc_activity.canonical', ['oc_activity' => $entity->id()]); + // 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')) { + drupal_set_message($this->t('The %bundle is now unpublished & hidden from you.', [ + '%bundle' => $entity->bundle(), + ])); + $form_state->setRedirect(''); + } else { + $form_state->setRedirect('entity.oc_activity.canonical', ['oc_activity' => $entity->id()]); + } } } diff --git a/modules/opencase_entities/src/Form/OCActorForm.php b/modules/opencase_entities/src/Form/OCActorForm.php index 25c612b..fe23b62 100644 --- a/modules/opencase_entities/src/Form/OCActorForm.php +++ b/modules/opencase_entities/src/Form/OCActorForm.php @@ -60,7 +60,10 @@ class OCActorForm 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 (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished actor entities')) { - $form_state->setRedirect('entity.node.canonical', ['node' => 1]); + drupal_set_message($this->t('The record for "%label" is now unpublished & hidden from you.', [ + '%label' => $entity->label(), + ])); + $form_state->setRedirect(''); } else { $form_state->setRedirect('entity.oc_actor.canonical', ['oc_actor' => $entity->id()]); } diff --git a/modules/opencase_entities/src/Form/OCEventForm.php b/modules/opencase_entities/src/Form/OCEventForm.php index 8211508..54affd1 100644 --- a/modules/opencase_entities/src/Form/OCEventForm.php +++ b/modules/opencase_entities/src/Form/OCEventForm.php @@ -60,7 +60,15 @@ class OCEventForm extends ContentEntityForm { '%label' => $entity->label(), ])); } - $form_state->setRedirect('entity.oc_event.canonical', ['oc_event' => $entity->id()]); + // 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')) { + drupal_set_message($this->t('The record for "%label" is now unpublished & hidden from you.', [ + '%label' => $entity->label(), + ])); + $form_state->setRedirect(''); + } else { + $form_state->setRedirect('entity.oc_event.canonical', ['oc_event' => $entity->id()]); + } } } diff --git a/modules/opencase_entities/src/Form/OCOrganisationForm.php b/modules/opencase_entities/src/Form/OCOrganisationForm.php index cc10943..bf05881 100644 --- a/modules/opencase_entities/src/Form/OCOrganisationForm.php +++ b/modules/opencase_entities/src/Form/OCOrganisationForm.php @@ -81,7 +81,15 @@ class OCOrganisationForm extends ContentEntityForm { '%label' => $entity->label(), ])); } - $form_state->setRedirect('entity.oc_organisation.canonical', ['oc_organisation' => $entity->id()]); + // 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')) { + drupal_set_message($this->t('The record for "%label" is now unpublished & hidden from you.', [ + '%label' => $entity->label(), + ])); + $form_state->setRedirect(''); + } else { + $form_state->setRedirect('entity.oc_organisation.canonical', ['oc_organisation' => $entity->id()]); + } } }