From 1878d1e2fd1049dcfc61b0e93d30b4337356b274 Mon Sep 17 00:00:00 2001 From: naomi Date: Mon, 18 Jun 2018 16:29:24 +0200 Subject: [PATCH] fixed bugs in entity type relations/widgets --- src/EntityTypeRelations.php | 4 +++- src/EntityTypeRelationsWidget.php | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/EntityTypeRelations.php b/src/EntityTypeRelations.php index c43f9c4..328266f 100644 --- a/src/EntityTypeRelations.php +++ b/src/EntityTypeRelations.php @@ -20,6 +20,8 @@ class EntityTypeRelations { public static function getAllowedActivityTypesForCaseType($case_type) { $caseTypeConfig = \Drupal::entityTypeManager()->getStorage('oc_case_type')->load($case_type); - return $caseTypeConfig->get('allowedActivityTypes'); // format: ['application' => 'application', 'interview' => 0] + $allowedActivityTypes = $caseTypeConfig->get('allowedActivityTypes'); // format: ['application' => 'application', 'interview' => 0] + if (!$allowedActivityTypes) $allowedActivityTypes = array(); + return $allowedActivityTypes; } } diff --git a/src/EntityTypeRelationsWidget.php b/src/EntityTypeRelationsWidget.php index 242834a..93f6c1a 100644 --- a/src/EntityTypeRelationsWidget.php +++ b/src/EntityTypeRelationsWidget.php @@ -47,6 +47,8 @@ class EntityTypeRelationsWidget { public function populate(&$form) { $case_type = $form['id']['#default_value']; $allowedActorTypes = EntityTypeRelations::getAllowedActorTypesForCaseType($case_type); + $form['allowed_actor_types']['#default_value'] = $allowedActorTypes; + $allowedActivityTypes = EntityTypeRelations::getAllowedActivityTypesForCaseType($case_type); $form['allowed_activity_types']['#default_value'] = $allowedActivityTypes; }