From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 7 Nov 2019 00:07:20 +0000 (-0500)
Subject: Don't write field defn unless changed
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=52cf76a7ab0ab4a42530bce86b1106808903d5dc;p=civicrm-core.git

Don't write field defn unless changed
---

diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index ecbdeddf6e..65a2f86a0b 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -34,6 +34,15 @@
           $timeout(function() {
             initialize(_.cloneDeep(newForm));
             editor.addEntity('Contact');
+            $scope.layout['#children'].push({
+              "#tag": "button",
+              "ng-click": "modelListCtrl.submit()",
+              "#children": [
+                {
+                  "#text": "Submit"
+                }
+              ]
+            });
           });
         }
 
@@ -47,7 +56,6 @@
           $scope.layout = getTags($scope.afform.layout, 'af-form')[0];
           evaluate($scope.layout['#children']);
           $scope.entities = getTags($scope.layout['#children'], 'af-entity', 'name');
-          expandFields($scope.layout['#children']);
           _.each(_.keys($scope.entities), buildFieldList);
 
           // Set changesSaved to true on initial load, false thereafter whenever changes are made to the model
@@ -132,7 +140,7 @@
             $scope.fieldList[entityName].push({
               "#tag": "af-field",
               name: field.name,
-              defn: _.cloneDeep(_.pick(field, ['title', 'input_type', 'input_attrs']))
+              defn: {}
             });
           });
         }
@@ -377,11 +385,11 @@
       controller: function($scope) {
 
         $scope.getEntity = function() {
-          return $scope.editor.getEntity($scope.entityName);
+          return $scope.editor ? $scope.editor.getEntity($scope.entityName) : {};
         };
 
         $scope.getDefn = function() {
-          return $scope.editor.getField($scope.getEntity().type, $scope.node.name);
+          return $scope.editor ? $scope.editor.getField($scope.getEntity().type, $scope.node.name) : {};
         };
       }
     };
@@ -434,20 +442,23 @@
     return {
       restrict: "A",
       require: "ngModel",
+      scope: {
+        defaultValue: '='
+      },
       link: function(scope, element, attrs, ngModel) {
         var ts = CRM.ts();
 
         function read() {
           var htmlVal = element.html();
           if (!htmlVal) {
-            htmlVal = ts('Unnamed');
+            htmlVal = scope.defaultValue;
             element.html(htmlVal);
           }
           ngModel.$setViewValue(htmlVal);
         }
 
         ngModel.$render = function() {
-          element.html(ngModel.$viewValue || ' ');
+          element.html(ngModel.$viewValue || scope.defaultValue);
         };
 
         // Special handling for enter and escape keys
@@ -459,7 +470,7 @@
           }
           // Escape: undo
           if (e.which === 27) {
-            element.html(ngModel.$viewValue || ' ');
+            element.html(ngModel.$viewValue || scope.defaultValue);
             element.blur();
           }
         });
diff --git a/ext/afform/gui/ang/afGuiEditor/config-entity.html b/ext/afform/gui/ang/afGuiEditor/config-entity.html
index cf32fadf03..e5c48d3ffe 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-entity.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-entity.html
@@ -21,7 +21,7 @@
     <legend>{{ ts('Fields') }}</legend>
     <div class="af-gui-field-select-list" ui-sortable="{update: rebuildFieldList, items: '> div:not(.disabled)', connectWith: '[data-entity=' + selectedEntity + '] [ui-sortable]'}" ng-model="fieldList[selectedEntity]">
       <div ng-repeat="field in fieldList[selectedEntity]" ng-class="{disabled: fieldInUse(selectedEntity, field.name)}">
-        {{ field.defn.title }}
+        {{ editor.getField(editor.getEntity(selectedEntity).type, field.name).title }}
       </div>
     </div>
   </fieldset>
diff --git a/ext/afform/gui/ang/afGuiEditor/field.html b/ext/afform/gui/ang/afGuiEditor/field.html
index e3a55a518f..01cc02d74a 100644
--- a/ext/afform/gui/ang/afGuiEditor/field.html
+++ b/ext/afform/gui/ang/afGuiEditor/field.html
@@ -2,6 +2,6 @@
   <span>{{ getEntity().label + ': ' + getDefn().title }}</span>
 </div>
 <div>
-  <label>{{ getDefn().title }}</label>
+  <label af-gui-editable ng-model="node.defn.title" default-value="getDefn().title">{{ node.defn.title || getDefn().title }}</label>
   <input class="form-control" disabled placeholder="{{ node.name }}" />
 </div>