From 736be2088bbeb9f46a3901e905388670bc120a4e Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 5 Apr 2022 20:37:04 -0400 Subject: [PATCH] Afform - Fix regression editing a content block with no entity type --- ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php | 4 ++-- ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php b/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php index eb0cc6039a..5621cbcce9 100644 --- a/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php +++ b/ext/afform/admin/Civi/Api4/Action/Afform/LoadAdminData.php @@ -153,8 +153,8 @@ class LoadAdminData extends \Civi\Api4\Generic\AbstractAction { } if ($info['definition']['type'] === 'block') { - $blockEntity = $info['definition']['join_entity'] ?? $info['definition']['entity_type']; - if ($blockEntity !== '*') { + $blockEntity = $info['definition']['join_entity'] ?? $info['definition']['entity_type'] ?? NULL; + if ($blockEntity) { $entities[] = $blockEntity; } $scanBlocks($info['definition']['layout']); diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js b/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js index 00bb14374c..c83a1575fa 100644 --- a/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js +++ b/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js @@ -76,7 +76,7 @@ else if (editor.getFormType() === 'block') { editor.layout['#children'] = editor.afform.layout; - editor.blockEntity = editor.afform.join_entity || editor.afform.entity_type; + editor.blockEntity = editor.afform.join_entity || editor.afform.entity_type || '*'; $scope.entities[editor.blockEntity] = backfillEntityDefaults({ type: editor.blockEntity, name: editor.blockEntity, -- 2.25.1