renamed function to be more intuitive

diff --git a/js/model/crm.uf.js b/js/model/crm.uf.js
index 907e108d45cd439cffc17cb927ebd28f6d7e792f..f75cbbff8d26d3feb826e14b16999c5a7fd09639 100644 (file)
--- a/js/model/crm.uf.js
+++ b/js/model/crm.uf.js
@@ -682,7 +682,7 @@
       });
       return allMatched;
     },
-    getUFGroupModel: function() {
+    calculateContactEntityType: function() {
       var ufGroupModel = this;
 
       // set proper entity model based on selected profile

diff --git a/js/view/crm.designer.js b/js/view/crm.designer.js
index 26b93d076dba0e4a4d190e9fc83a8085c0a7d53f..de2e88ab04ec10c95d8b2f9fa7ab3f8a8b574a75 100644 (file)
--- a/js/view/crm.designer.js
+++ b/js/view/crm.designer.js
@@ -327,7 +327,7 @@
         _.each(ufEntityModel.getSections(), function(section, sectionKey){
           var defaultValue = paletteView.selectedContactType;
           if (!defaultValue) {
-            defaultValue = paletteView.model.getUFGroupModel();
+            defaultValue = paletteView.model.calculateContactEntityType();
           }
 
           // set selected option as default, since we are rebuilding palette

diff --git a/js/view/crm.profile-selector.js b/js/view/crm.profile-selector.js
index 75977cc83d67dff19cae240f2629420d6377edac..306279a2509c575c46960b9015aeddbc1a106906 100644 (file)
--- a/js/view/crm.profile-selector.js
+++ b/js/view/crm.profile-selector.js
@@ -115,7 +115,7 @@
             success: function(formData) {
               // Note: With chaining, API returns some extraneous keys that aren't part of UFGroupModel
               var ufGroupModel = new CRM.UF.UFGroupModel(_.pick(formData, _.keys(CRM.UF.UFGroupModel.prototype.schema)));
-              ufGroupModel.setUFGroupModel(ufGroupModel.getUFGroupModel(), profileSelectorView.options.ufEntities);
+              ufGroupModel.setUFGroupModel(ufGroupModel.calculateContactEntityType(), profileSelectorView.options.ufEntities);
               ufGroupModel.getRel('ufFieldCollection').reset(_.values(formData["api.UFField.get"].values));
               options.onLoad(ufGroupModel);
             }
@@ -137,7 +137,7 @@
             success: function(formData) {
               // Note: With chaining, API returns some extraneous keys that aren't part of UFGroupModel
               var ufGroupModel = new CRM.UF.UFGroupModel(_.pick(formData, _.keys(CRM.UF.UFGroupModel.prototype.schema)));
-              ufGroupModel.setUFGroupModel(ufGroupModel.getUFGroupModel(), profileSelectorView.options.ufEntities);
+              ufGroupModel.setUFGroupModel(ufGroupModel.calculateContactEntityType(), profileSelectorView.options.ufEntities);
               ufGroupModel.getRel('ufFieldCollection').reset(_.values(formData["api.UFField.get"].values));
               options.onLoad(ufGroupModel.deepCopy());
             }