From 229a3e3998244ffe83fc88f260539fc44cc2529c Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 25 Apr 2021 13:51:51 -0400
Subject: [PATCH] AfformGui - Specify admin tpl in entity config file &
 fall-back to generic

---
 ext/afform/admin/afformEntities/Household.php               | 1 +
 ext/afform/admin/afformEntities/Individual.php              | 1 +
 ext/afform/admin/afformEntities/Organization.php            | 1 +
 ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js   | 4 ++++
 ext/afform/admin/ang/afGuiEditor/afGuiEntity.html           | 2 +-
 ext/afform/admin/ang/afGuiEditor/entityConfig/Activity.html | 1 -
 6 files changed, 8 insertions(+), 2 deletions(-)
 delete mode 100644 ext/afform/admin/ang/afGuiEditor/entityConfig/Activity.html

diff --git a/ext/afform/admin/afformEntities/Household.php b/ext/afform/admin/afformEntities/Household.php
index 00173428d7..cf569b3432 100644
--- a/ext/afform/admin/afformEntities/Household.php
+++ b/ext/afform/admin/afformEntities/Household.php
@@ -13,4 +13,5 @@ return [
   'boilerplate' => [
     ['#tag' => 'afblock-name-household'],
   ],
+  'admin_tpl' => '~/afGuiEditor/entityConfig/Contact.html',
 ];
diff --git a/ext/afform/admin/afformEntities/Individual.php b/ext/afform/admin/afformEntities/Individual.php
index b6c972754b..cc580425e4 100644
--- a/ext/afform/admin/afformEntities/Individual.php
+++ b/ext/afform/admin/afformEntities/Individual.php
@@ -13,4 +13,5 @@ return [
   'boilerplate' => [
     ['#tag' => 'afblock-name-individual'],
   ],
+  'admin_tpl' => '~/afGuiEditor/entityConfig/Contact.html',
 ];
diff --git a/ext/afform/admin/afformEntities/Organization.php b/ext/afform/admin/afformEntities/Organization.php
index aba69f9f44..5335b6ddc2 100644
--- a/ext/afform/admin/afformEntities/Organization.php
+++ b/ext/afform/admin/afformEntities/Organization.php
@@ -13,4 +13,5 @@ return [
   'boilerplate' => [
     ['#tag' => 'afblock-name-organization'],
   ],
+  'admin_tpl' => '~/afGuiEditor/entityConfig/Contact.html',
 ];
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js b/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
index 721c41ec6e..e2d2c249a8 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiEntity.component.js
@@ -26,6 +26,10 @@
         return afGui.meta.entities[getEntityType()];
       };
 
+      $scope.getAdminTpl = function() {
+        return $scope.getMeta().admin_tpl || '~/afGuiEditor/entityConfig/Generic.html';
+      };
+
       $scope.getField = afGui.getField;
 
       $scope.valuesFields = function() {
diff --git a/ext/afform/admin/ang/afGuiEditor/afGuiEntity.html b/ext/afform/admin/ang/afGuiEditor/afGuiEntity.html
index eed6f6e7c9..1c337c553d 100644
--- a/ext/afform/admin/ang/afGuiEditor/afGuiEntity.html
+++ b/ext/afform/admin/ang/afGuiEditor/afGuiEntity.html
@@ -56,5 +56,5 @@
 
 <fieldset ng-if="!$ctrl.entity.loading && $ctrl.editor.allowEntityConfig">
   <legend>{{:: ts('Options') }}</legend>
-  <div ng-include="::'~/afGuiEditor/entityConfig/' + $ctrl.entity.type + '.html'"></div>
+  <div ng-include=":: getAdminTpl()"></div>
 </fieldset>
diff --git a/ext/afform/admin/ang/afGuiEditor/entityConfig/Activity.html b/ext/afform/admin/ang/afGuiEditor/entityConfig/Activity.html
deleted file mode 100644
index 15e56f1cbe..0000000000
--- a/ext/afform/admin/ang/afGuiEditor/entityConfig/Activity.html
+++ /dev/null
@@ -1 +0,0 @@
-<div ng-include="'~/afGuiEditor/entityConfig/Generic.html'"></div>
-- 
2.25.1