rename contact_1 to individual_1 for individual model

diff --git a/CRM/Campaign/Form/Survey/Questions.php b/CRM/Campaign/Form/Survey/Questions.php
index a9ec2f13251350f910296a7bdf95081ac57b1f29..5f83230d026e3a86a1076ab21e121317b1e68cad 100644 (file)
--- a/CRM/Campaign/Form/Survey/Questions.php
+++ b/CRM/Campaign/Form/Survey/Questions.php
@@ -94,7 +94,7 @@ class CRM_Campaign_Form_Survey_Questions extends CRM_Campaign_Form_Survey {
       'ActivityType' => array($subTypeId),
     );
     $entities = array(
-      array('entity_name' => 'contact_1', 'entity_type' => 'IndividualModel'),
+      array('entity_name' => 'individual_1', 'entity_type' => 'IndividualModel'),
       array('entity_name' => 'activity_1', 'entity_type' => 'ActivityModel', 'entity_sub_type' => $subTypeId),
     );
     $this->addProfileSelector('contact_profile_id', ts('Contact Info'), $allowCoreTypes, $allowSubTypes, $entities);

diff --git a/CRM/Contribute/Form/ContributionPage/Custom.php b/CRM/Contribute/Form/ContributionPage/Custom.php
index 86c3ded5043a58a9acf27603d071cc21d669156a..ee6fbaa891f5700b6e1e91c86b9f26b80d955876 100644 (file)
--- a/CRM/Contribute/Form/ContributionPage/Custom.php
+++ b/CRM/Contribute/Form/ContributionPage/Custom.php
@@ -46,9 +46,9 @@ class CRM_Contribute_Form_ContributionPage_Custom extends CRM_Contribute_Form_Co
    */
   public function buildQuickForm() {
 
-    // Register 'contact_1'
+    // Register 'individual_1' model
     $entities = array();
-    $entities[] = array('entity_name' => 'contact_1', 'entity_type' => 'IndividualModel');
+    $entities[] = array('entity_name' => 'individual_1', 'entity_type' => 'IndividualModel');
     $allowCoreTypes = array_merge(array('Contact', 'Individual'), CRM_Contact_BAO_ContactType::subTypes('Individual'));
     $allowSubTypes = array();
 

diff --git a/CRM/Contribute/Form/ContributionPage/Settings.php b/CRM/Contribute/Form/ContributionPage/Settings.php
index 46219b0bc9fe9d33b799b72de09394462414bba8..d30646557fb50ebf3466da482076d64d178c9fc8 100644 (file)
--- a/CRM/Contribute/Form/ContributionPage/Settings.php
+++ b/CRM/Contribute/Form/ContributionPage/Settings.php
@@ -222,7 +222,7 @@ class CRM_Contribute_Form_ContributionPage_Settings extends CRM_Contribute_Form_
     );
 
     $entities = array(
-      array('entity_name' => 'contact_1',
+      array('entity_name' => 'individual_1',
         'entity_type' => 'IndividualModel'
       ),
       array('entity_name' => 'organization_1',

diff --git a/js/jquery/jquery.crmProfileSelector.js b/js/jquery/jquery.crmProfileSelector.js
index 3c09e7f4608ed1382b8fd5122e7fad3f0eba4ea4..62a0ec7f1c4ae94e83036fa4c72643f4bb434ea9 100644 (file)
--- a/js/jquery/jquery.crmProfileSelector.js
+++ b/js/jquery/jquery.crmProfileSelector.js
@@ -14,11 +14,11 @@
    * ...
    * cj('.crm-profile-selector').crmProfileSelector({
    *   groupTypeFilter: "Contact,Individual,Activity;;ActivityType:7",
-   *   entities: "contact_1:IndividualModel,activity_1:ActivityModel"
+   *   entities: "individual_1:IndividualModel,activity_1:ActivityModel"
    * });
    *
    * Note: The system does not currently support dynamic entities -- it only supports
-   * a couple of entities named "contact_1" and "activity_1". See also
+   * a couple of entities named "individual_1" and "activity_1". See also
    * CRM.UF.guessEntityName().
    */
   $.fn.crmProfileSelector = function(options) {

diff --git a/js/model/crm.uf.js b/js/model/crm.uf.js
index cda2abcb9dd14940138dcc51d87619513cb8d005..d88578f627c3e77904bfd15fd8e88a9129fcfbca 100644 (file)
--- a/js/model/crm.uf.js
+++ b/js/model/crm.uf.js
@@ -77,7 +77,7 @@
     switch (field_type) {
       case 'Contact':
       case 'Individual':
-        return 'contact_1';
+        return 'individual_1';
       case 'Organization':
         return 'organization_1';
       case 'Household':