CRM-11799 fix on form is_primary for address handling

JoeMurray · Feb 27, 2013 · 9d3a2fb · 9d3a2fb
1 parent d36fb4d
commit 9d3a2fb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
@@ -1860,9 +1860,7 @@ static function formatProfileContactParams(&$params, &$fields, $contactID = NULL
             $data[$blockName][$loc]['is_primary'] = 1;
           }
         }
-        elseif (($locTypeId == $defaultLocationId || $locTypeId == $billingLocationTypeId) &&
-          ($loc == 1 || !CRM_Utils_Array::retrieveValueRecursive($data['location'][$loc - 1], 'is_primary'))
-        ) {
+        elseif ($locTypeId == $defaultLocationId) {
           $data[$blockName][$loc]['is_primary'] = 1;
         }
 

diff --git a/CRM/Core/BAO/Address.php b/CRM/Core/BAO/Address.php
@@ -63,7 +63,7 @@ static function create(&$params, $fixAddress, $entity = NULL) {
     ) {
       return;
     }
-
+    CRM_Core_BAO_Block::sortPrimaryFirst($params['address']);
     $addresses = array();
     $contactId = NULL;
 

diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
@@ -445,7 +445,6 @@ public static function handlePrimary(&$params, $class) {
     elseif (CRM_Utils_Array::value('contact_id', $params)) {
       $contactId = $params['contact_id'];
     }
-
     if ( !$contactId ) {
       // entity not associated with contact so concept of is_primary not relevant
       return;
@@ -494,5 +493,29 @@ public static function handlePrimary(&$params, $class) {
       $existingEntities->save();
     }
   }
+
+  /**
+   * Sort location array so primary element is first
+   * @param Array $location
+   */
+  static function sortPrimaryFirst(&$locations){
+    uasort($locations, 'self::primaryComparison');
+  }
+
+/**
+ * compare 2 locations to see which should go first based on is_primary
+ * (sort function for sortPrimaryFirst)
+ * @param array $location1
+ * @param array_type $location2
+ * @return number
+ */
+  static function primaryComparison($location1, $location2){
+    $l1 = CRM_Utils_Array::value('is_primary', $location1);
+    $l2 = CRM_Utils_Array::value('is_primary', $location2);
+    if ($l1 == $l2) {
+      return 0;
+    }
+    return ($l1 < $l2) ? -1 : 1;
+  }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         ) {
           return;
         }
+        CRM_Core_BAO_Block::sortPrimaryFirst($params['address']);
         $addresses = array();
         $contactId = NULL;
@@ Expand Down @@