From aaf3e9b30c252c135f3f98b50c10370c042a2ac7 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 31 Oct 2019 21:53:24 -0700
Subject: [PATCH] af-fieldset - More updates for switching E=>A

---
 ext/afform/core/CRM/Afform/ArrayHtml.php | 4 +---
 ext/afform/core/ang/af.ang.php           | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/CRM/Afform/ArrayHtml.php b/ext/afform/core/CRM/Afform/ArrayHtml.php
index 99fd3221b7..a8f55b2273 100644
--- a/ext/afform/core/CRM/Afform/ArrayHtml.php
+++ b/ext/afform/core/CRM/Afform/ArrayHtml.php
@@ -20,6 +20,7 @@ class CRM_Afform_ArrayHtml {
   private $protoSchema = [
     '*' => [
       '*' => 'text',
+      'af-fieldset' => 'text',
     ],
     'af-entity' => [
       '#selfClose' => TRUE,
@@ -32,9 +33,6 @@ class CRM_Afform_ArrayHtml {
       'name' => 'text',
       'defn' => 'js',
     ],
-    'af-fieldset' => [
-      'model' => 'text',
-    ],
     'area' => ['#selfClose' => TRUE],
     'base' => ['#selfClose' => TRUE],
     'br' => ['#selfClose' => TRUE],
diff --git a/ext/afform/core/ang/af.ang.php b/ext/afform/core/ang/af.ang.php
index a97b538142..0dae45cef5 100644
--- a/ext/afform/core/ang/af.ang.php
+++ b/ext/afform/core/ang/af.ang.php
@@ -16,7 +16,7 @@ return [
   'basePages' => [],
   'exports' => [
     'af-entity' => 'AE',
-    'af-fieldset' => 'AE',
+    'af-fieldset' => 'A',
     'af-form' => 'AE',
   ],
 ];
-- 
2.25.1