Merge pull request #4757 from davecivicrm/CRM-15409

[civicrm-core.git] / js / model / crm.uf.js

diff --git a/js/model/crm.uf.js b/js/model/crm.uf.js
index 392d0a44141cd4e1c44823eb452f8dfd6dae2936..be089b1a321ec2820fe6ec15d284aca96455b239 100644 (file)
--- a/js/model/crm.uf.js
+++ b/js/model/crm.uf.js
@@ -104,7 +104,12 @@
       case 'Case':
         return 'case_1';
       default:
-        throw "Cannot guess entity name for field_type=" + field_type;
+        if (!$.isEmptyObject(CRM.contactSubTypes) && ($.inArray(field_type,CRM.contactSubTypes) > -1)) {
+          return 'contact_1';
+        }
+        else {
+          throw "Cannot guess entity name for field_type=" + field_type;
+        }
     }
   }
 
@@ -496,7 +501,7 @@
         type: 'TextArea'
       },
       'help_pre': {
-        title: ts('Pre-form Help '),
+        title: ts('Pre-form Help'),
         help: ts('Explanatory text displayed at the beginning of the form.')
           + ts('Note that this help text is displayed on profile create/edit screens only.'),
         type: 'TextArea'
@@ -525,7 +530,7 @@
         options: YESNO
       },
       'is_proximity_search': {
-        title: ts('Proximity search'),
+        title: ts('Proximity Search'),
         help: ts('FIXME'),
         type: 'Select',
         options: YESNO // FIXME
@@ -666,8 +671,9 @@
      * @return {Boolean}
      */
     //CRM-15427
-    checkGroupType: function(validTypesExpr, allowAllSubtypes = false) {
+    checkGroupType: function(validTypesExpr, allowAllSubtypes) {
       var allMatched = true;
+      allowAllSubtypes = allowAllSubtypes || false;
       if (! this.get('group_type') || this.get('group_type') == '') {
         return true;
       }