From 3e91789d5906f0e72e2af23df1c31dcb7b6d4bce Mon Sep 17 00:00:00 2001
From: kurund <kurund@civicrm.org>
Date: Thu, 23 Jan 2014 14:37:37 -0800
Subject: [PATCH] rename contact_1 to individual_1 for individual model

---
 CRM/Campaign/Form/Survey/Questions.php            | 2 +-
 CRM/Contribute/Form/ContributionPage/Custom.php   | 4 ++--
 CRM/Contribute/Form/ContributionPage/Settings.php | 2 +-
 js/jquery/jquery.crmProfileSelector.js            | 4 ++--
 js/model/crm.uf.js                                | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CRM/Campaign/Form/Survey/Questions.php b/CRM/Campaign/Form/Survey/Questions.php
index a9ec2f1325..5f83230d02 100644
--- 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 86c3ded504..ee6fbaa891 100644
--- 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 46219b0bc9..d30646557f 100644
--- 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 3c09e7f460..62a0ec7f1c 100644
--- 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 cda2abcb9d..d88578f627 100644
--- 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':
-- 
2.25.1