Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-20-19-00-14

CRM/Contact/Selector.php

@@ -328,6 +328,19 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
    */
   function &getColumnHeaders($action = NULL, $output = NULL) {
     $headers = NULL;
+
+    // unset return property elements that we don't care
+    if (!empty($this->_returnProperties)) {
+      $doNotCareElements = array(
+        'contact_type',
+        'contact_sub_type',
+        'sort_name',
+      );
+      foreach ( $doNotCareElements as $value) {
+        unset($this->_returnProperties[$value]);
+      }
+    }
+
     if ($output == CRM_Core_Selector_Controller::EXPORT) {
       $csvHeaders = array(ts('Contact Id'), ts('Contact Type'));
       foreach ($this->getColHeads($action, $output) as $column) {
@@ -430,10 +443,6 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
       $properties = self::makeProperties($this->_returnProperties);
 
       foreach ($properties as $prop) {
-        if ($prop == 'contact_type' || $prop == 'contact_sub_type' || $prop == 'sort_name') {
-          continue;
-        }
-
         if (strpos($prop, '-')) {
           list($loc, $fld, $phoneType) = CRM_Utils_System::explode('-', $prop, 3);
           $title = $this->_query->_fields[$fld]['title'];
@@ -444,7 +453,8 @@ class CRM_Contact_Selector extends CRM_Core_Selector_Base implements CRM_Core_Se
         }
         elseif (isset($this->_query->_fields[$prop]) && isset($this->_query->_fields[$prop]['title'])) {
           $title = $this->_query->_fields[$prop]['title'];
-        } else {
+        }
+        else {
           $title = '';
         }
 

CRM/Utils/Array.php

@@ -635,5 +635,48 @@ class CRM_Utils_Array {
     }
     return $default;
   }
+
+  /**
+   * Generate the Cartesian product of zero or more vectors
+   *
+   * @param array $dimensions list of dimensions to multiply; each key is a dimension name; each value is a vector
+   * @param array $template a base set of values included in every output
+   * @return array each item is a distinct combination of values from $dimensions
+   *
+   * For example, the product of
+   * {
+   *   fg => {red, blue},
+   *   bg => {white, black}
+   * }
+   * would be
+   * {
+   *   {fg => red, bg => white},
+   *   {fg => red, bg => black},
+   *   {fg => blue, bg => white},
+   *   {fg => blue, bg => black}
+   * }
+   */
+  static function product($dimensions, $template = array()) {
+    if (empty($dimensions)) {
+      return array($template);
+    }
+
+    foreach ($dimensions as $key => $value) {
+      $firstKey = $key;
+      $firstValues = $value;
+      break;
+    }
+    unset($dimensions[$key]);
+
+    $results = array();
+    foreach ($firstValues as $firstValue) {
+      foreach (self::product($dimensions, $template) as $result) {
+        $result[$firstKey] = $firstValue;
+        $results[] = $result;
+      }
+    }
+
+    return $results;
+  }
 }
 

api/v3/Profile.php

@@ -581,8 +581,10 @@ function _civicrm_api3_buildprofile_submitfields($profileID, $optionsBehaviour =
         if(isset($profileFields[$profileID][$entityfield])) {
           unset($profileFields[$profileID][$entityfield]);
         }
-        // we will make the mixed case version (e.g. of 'Primary') an alias
-        $profileFields[$profileID][$fieldName]['api.aliases'][] = $entityfield;
+        if(!in_array($entityfield, $profileFields[$profileID][$fieldName]['api.aliases'])) {
+          // we will make the mixed case version (e.g. of 'Primary') an alias
+          $profileFields[$profileID][$fieldName]['api.aliases'][] = $entityfield;
+        }
       }
       /**
        * putting this on hold -this would cause the api to set the default - but could have unexpected behaviour

api/v3/examples/Activity/ContactRefCustomField.php

@@ -95,4 +95,4 @@ function activity_create_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/Activity/ContactRefCustomFieldGet.php

@@ -49,6 +49,8 @@ function activity_get_expectedresult(){
           'is_current_revision' => '1',
           'is_deleted' => 0,
           'source_contact_id' => '1',
+          'custom_1' => 'defaultValue',
+          'custom_1_1' => 'defaultValue',
           'custom_2_id' => '1',
           'custom_2_1_id' => '1',
           'custom_2' => 'Anderson, Anthony',
@@ -81,4 +83,4 @@ function activity_get_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/Activity/DateTimeHigh.php

@@ -78,4 +78,4 @@ function activity_get_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/Activity/DateTimeLow.php

@@ -77,4 +77,4 @@ function activity_get_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/Activity/GetTargetandAssignee.php

@@ -96,4 +96,4 @@ function activity__expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/Activity/ReturnAssigneeContact.php

@@ -79,11 +79,16 @@ function activity_get_expectedresult(){
                       'nick_name' => '',
                       'legal_name' => '',
                       'image_URL' => '',
+                      'preferred_communication_method' => '',
+                      'preferred_language' => 'en_US',
                       'preferred_mail_format' => 'Both',
                       'first_name' => 'Anthony',
                       'middle_name' => 'J.',
                       'last_name' => 'Anderson',
+                      'prefix_id' => 'Mr.',
+                      'suffix_id' => 'II',
                       'job_title' => '',
+                      'gender_id' => '',
                       'birth_date' => '',
                       'is_deceased' => 0,
                       'deceased_date' => '',
@@ -114,6 +119,9 @@ function activity_get_expectedresult(){
                       'im' => '',
                       'worldregion_id' => '',
                       'world_region' => '',
+                      'individual_prefix' => 'Mr.',
+                      'individual_suffix' => 'II',
+                      'gender' => '',
                       'state_province_name' => '',
                       'state_province' => '',
                       'country' => '',
@@ -149,4 +157,4 @@ function activity_get_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/ActivityCreate.php

@@ -95,4 +95,4 @@ function activity_create_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/ActivityDelete.php

@@ -58,4 +58,4 @@ function activity_delete_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/ActivityGet.php

@@ -77,4 +77,4 @@ function activity_get_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/ActivityGetfields.php

@@ -45,6 +45,7 @@ function activity_getfields_expectedresult(){
           'import' => true,
           'where' => 'civicrm_activity.activity_type_id',
           'headerPattern' => '/(activity.)?type(.id$)/i',
+          'default' => '1',
           'pseudoconstant' => array(
               'optionGroupName' => 'activity_type',
             ),
@@ -94,7 +95,7 @@ function activity_getfields_expectedresult(){
           'name' => 'relationship_id',
           'type' => 1,
           'title' => 'Relationship Id',
-          'default' => 'UL',
+          'default' => 'NULL',
           'FKClassName' => 'CRM_Contact_DAO_Relationship',
         ),
       'is_current_revision' => array(
@@ -105,6 +106,7 @@ function activity_getfields_expectedresult(){
           'where' => 'civicrm_activity.is_current_revision',
           'headerPattern' => '/(is.)?(current.)?(revision|version(ing)?)/i',
           'export' => true,
+          'default' => '1',
         ),
       'original_id' => array(
           'name' => 'original_id',
@@ -187,6 +189,9 @@ function activity_getfields_expectedresult(){
               'optionGroupName' => 'activity_status',
             ),
           'uniqueName' => 'activity_status_id',
+          'api.aliases' => array(
+              '0' => 'activity_status',
+            ),
         ),
       'is_test' => array(
           'name' => 'is_test',
@@ -202,7 +207,7 @@ function activity_getfields_expectedresult(){
           'name' => 'medium_id',
           'type' => 1,
           'title' => 'Activity Medium',
-          'default' => 'UL',
+          'default' => 'NULL',
           'pseudoconstant' => array(
               'optionGroupName' => 'encounter_medium',
             ),
@@ -229,11 +234,16 @@ function activity_getfields_expectedresult(){
       'campaign_id' => array(
           'name' => 'campaign_id',
           'type' => 1,
-          'title' => 'Campaign ID',
+          'title' => 'Campaign',
           'import' => true,
           'where' => 'civicrm_activity.campaign_id',
           'export' => true,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
+          'pseudoconstant' => array(
+              'table' => 'civicrm_campaign',
+              'keyColumn' => 'id',
+              'labelColumn' => 'title',
+            ),
           'uniqueName' => 'activity_campaign_id',
         ),
       'engagement_level' => array(
@@ -294,4 +304,4 @@ function activity_getfields_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/ActivityTypeCreate.php

@@ -36,10 +36,10 @@ function activity_type_create_expectedresult(){
   'is_error' => 0,
   'version' => 3,
   'count' => 1,
-  'id' => 722,
+  'id' => 727,
   'values' => array(
-      '722' => array(
-          'id' => '722',
+      '727' => array(
+          'id' => '727',
           'option_group_id' => '2',
           'label' => 'send out letters',
           'value' => '46',
@@ -83,4 +83,4 @@ function activity_type_create_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/ActivityTypeGet.php

@@ -102,4 +102,4 @@ function activity_type_get_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/Address/AddressLike.php

@@ -77,4 +77,4 @@ function address_get_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/Address/AddressParse.php

@@ -76,4 +76,4 @@ function address_create_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/Address/AddressSort.php

@@ -96,4 +96,4 @@ function address_get_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/AddressCreate.php

@@ -82,4 +82,4 @@ function address_create_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file

api/v3/examples/AddressDelete.php

@@ -58,4 +58,4 @@ function address_delete_expectedresult(){
 *
 * API Standards documentation:
 * http://wiki.civicrm.org/confluence/display/CRM/API+Architecture+Standards
-*/
+*/
\ No newline at end of file