From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 7 Apr 2022 01:07:19 +0000 (-0400)
Subject: Merge branch '5.48' to master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8ee40033d15089808451f828d3301fc36ecb2c79;p=civicrm-core.git

Merge branch '5.48' to master
---

8ee40033d15089808451f828d3301fc36ecb2c79
diff --cc ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
index a7b93544d8,c83a1575fa..f99ca04689
--- a/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiEditor.component.js
@@@ -74,12 -73,10 +74,12 @@@
              editor.layout['#children'].push(afGui.meta.elements.submit.element);
            }
          }
 -
 -        else if (editor.getFormType() === 'block') {
 +        else {
            editor.layout['#children'] = editor.afform.layout;
 +        }
 +
 +        if (editor.getFormType() === 'block') {
-           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,