Merge pull request #19067 from eileenmcnaughton/weight

Quick fix on summary actions conflict
civicrm · Dec 3, 2020 · a11f15b · a11f15b
2 parents e10c022 + 76b6a55
commit a11f15b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
@@ -3181,6 +3181,11 @@ public static function contextMenu($contactId = NULL) {
         }
 
         // finally get menu item for -more- action widget.
+        while (!empty($contextMenu['moreActions'][$values['weight']])) {
+          // Quick & dirty way of handling 2 items with the same weight
+          // without clobbering one.
+          $values['weight']++;
+        }
         $contextMenu['moreActions'][$values['weight']] = [
           'title' => $values['title'],
           'ref' => $values['ref'],
@@ -3198,6 +3203,11 @@ public static function contextMenu($contactId = NULL) {
           }
 
           // finally get menu item for -more- action widget.
+          while (!empty($contextMenu['otherActions'][$value['weight']])) {
+            // Quick & dirty way of handling 2 items with the same weight
+            // without clobbering one.
+            $value['weight']++;
+          }
           $contextMenu['otherActions'][$value['weight']] = [
             'title' => $value['title'],
             'ref' => $value['ref'],

diff --git a/tests/phpunit/CRM/Contact/Form/Search/CriteriaTest.php b/tests/phpunit/CRM/Contact/Form/Search/CriteriaTest.php
@@ -22,7 +22,7 @@ class CRM_Contact_Form_Search_CriteriaTest extends CiviUnitTestCase {
    * Test that the 'multiple bulk email' setting correctly affects the type of
    * field used for the 'email on hold' criteria in Advanced Search.
    */
-  public function testAdvancedHSearchObservesMultipleBulkEmailSetting() {
+  public function testAdvancedHSearchObservesMultipleBulkEmailSetting(): void {
 
     // If setting is enabled, criteria should be a select element.
     Civi::settings()->set('civimail_multiple_bulk_emails', 1);