From e0295754e9d135f872022652b2b1e68d5532908b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 26 Aug 2019 22:33:37 -0400
Subject: [PATCH] Add afData property for predetermined data like contact_id

---
 ext/afform/core/ang/af/ModelList.js | 4 ++--
 ext/afform/core/ang/af/ModelProp.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/ang/af/ModelList.js b/ext/afform/core/ang/af/ModelList.js
index 85222bf806..03652da7ae 100644
--- a/ext/afform/core/ang/af/ModelList.js
+++ b/ext/afform/core/ang/af/ModelList.js
@@ -22,7 +22,7 @@
 
         this.registerEntity = function registerEntity(entity) {
           schema[entity.afName] = entity;
-          data[entity.afName] = data[entity.afName] || {};
+          data[entity.afName] = entity.afData || {};
         };
         this.registerField = function(entityName, fieldName) {
           schema[entityName].fields.push(fieldName);
@@ -48,7 +48,7 @@
             crmApi4('Afform', 'prefill', {name: CRM.afform.open, args: $routeParams})
               .then(function(result) {
                 _.each(result, function(item) {
-                  data[item.name] = item.values;
+                  data[item.name] = _.extend(item.values, schema[item.name].afData || {});
                 });
               });
           }
diff --git a/ext/afform/core/ang/af/ModelProp.js b/ext/afform/core/ang/af/ModelProp.js
index 47426a6cc5..7bf5b45418 100644
--- a/ext/afform/core/ang/af/ModelProp.js
+++ b/ext/afform/core/ang/af/ModelProp.js
@@ -6,6 +6,7 @@
     // (at least the ones we care about client-side - other's can be added for server-side processing and we'll just ignore them)
     var modelProps = {
       afType: '@',
+      afData: '=',
       afName: '@',
       afLabel: '@',
       afAutofill: '@'
-- 
2.25.1