X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=js%2Fmodel%2Fcrm.designer.js;h=752cf86415c8fb75292ce486a7400b7ccc2341c7;hb=839bb4781992a410d3b3d2894ce0e9ac0ce48951;hp=2553b157f618f28df4b7bbe3d0db16c5114574df;hpb=68acd6ae8e764d8e713829675cfadfdefff770e8;p=civicrm-core.git

diff --git a/js/model/crm.designer.js b/js/model/crm.designer.js
index 2553b157f6..752cf86415 100644
--- a/js/model/crm.designer.js
+++ b/js/model/crm.designer.js
@@ -70,7 +70,9 @@
         label: this.getLabel(),
         entity_name: this.get('entityName'),
         field_type: this.getFieldSchema().civiFieldType,
-        field_name: this.get('fieldName')
+        // For some reason the 'formatting' field gets a random number appended in core so we mimic that here.
+        // TODO: Why?
+        field_name: this.get('fieldName') == 'formatting' ? 'formatting_' + (Math.floor(Math.random() * 8999) + 1000) : this.get('fieldName')
       });
       return model;
     }
@@ -95,6 +97,9 @@
      * @return {CRM.Designer.PaletteFieldModel}
      */
     getFieldByName: function(entityName, fieldName) {
+      if (fieldName.indexOf('formatting') === 0) {
+        fieldName = 'formatting';
+      }
       return this.find(function(paletteFieldModel) {
         return ((!entityName || paletteFieldModel.get('entityName') == entityName) && paletteFieldModel.get('fieldName') == fieldName);
       });