From 87219ba009e99618302c6d305d8561fcbe222e0c Mon Sep 17 00:00:00 2001 From: naomi Date: Tue, 12 Jul 2022 09:17:36 +0100 Subject: [PATCH] when deleting activity from case redirect to case --- modules/opencase_cases/opencase_cases.module | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/opencase_cases/opencase_cases.module b/modules/opencase_cases/opencase_cases.module index 1c6d72d..179e02f 100644 --- a/modules/opencase_cases/opencase_cases.module +++ b/modules/opencase_cases/opencase_cases.module @@ -139,12 +139,9 @@ function _opencase_cases_delete_activity_redirect($form, &$form_state) { $entity = $form_state->getFormObject()->getEntity(); // for some reason this fires when deleting an activity type, shouldn't do but.s if ($entity instanceof \Drupal\opencase_entities\Entity\OCActivityType) return; - if (!IsEmpty($entity->oc_case)) { - $case_id = $entity->oc_case->target_id; + $case_id = $entity->oc_case->target_id; + if ($case_id) { $form_state->setRedirect('entity.oc_case.canonical', ['oc_case' => $case_id]); - } else { - $target_actor_id = $entity->oc_target->target_id; - $form_state->setRedirect('entity.oc_actor.canonical', ['oc_actor' => $target_actor_id]); } } /**