From d74989f237b192f6607e05f3d9555d6555c806a4 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 17 May 2023 21:17:46 +1200 Subject: [PATCH] Add weight to a couple more links --- CRM/Mailing/BAO/Mailing.php | 12 +++++++----- tests/phpunit/api/v3/JobProcessMailingTest.php | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 81024cb27b..dfd5ee7dcd 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -2119,21 +2119,23 @@ ORDER BY civicrm_email.is_bulkmail DESC case 'opened': // do not use group by clause in report, because same report used for total and unique open - $reportFilter .= "&distinct=0"; + $reportFilter .= '&distinct=0'; case 'opened_unique': - $url = "mailing/opened"; - $searchFilter .= "&mailing_open_status=Y"; + $url = 'mailing/opened'; + $searchFilter .= '&mailing_open_status=Y'; break; case 'clicks': case 'clicks_unique': - $url = "mailing/clicks"; - $searchFilter .= "&mailing_click_status=Y"; + $url = 'mailing/clicks'; + $searchFilter .= '&mailing_click_status=Y'; break; } $actionLinks[CRM_Core_Action::VIEW]['url'] = CRM_Report_Utils_Report::getNextUrl($url, $reportFilter, FALSE, TRUE); + $actionLinks[CRM_Core_Action::VIEW]['weight'] = -20; if (array_key_exists(CRM_Core_Action::ADVANCED, $actionLinks)) { $actionLinks[CRM_Core_Action::ADVANCED]['qs'] = $searchFilter; + $actionLinks[CRM_Core_Action::ADVANCED]['weight'] = 10; } $report['event_totals']['actionlinks'][$key] = CRM_Core_Action::formLink( $actionLinks, diff --git a/tests/phpunit/api/v3/JobProcessMailingTest.php b/tests/phpunit/api/v3/JobProcessMailingTest.php index 9336c42034..24712ee8ef 100644 --- a/tests/phpunit/api/v3/JobProcessMailingTest.php +++ b/tests/phpunit/api/v3/JobProcessMailingTest.php @@ -170,7 +170,7 @@ class api_v3_JobProcessMailingTest extends CiviUnitTestCase { /** * Test pause and resume on Mailing. */ - public function testPauseAndResumeMailing() { + public function testPauseAndResumeMailing(): void { $this->createContactsInGroup(10, $this->_groupID); Civi::settings()->add([ 'mailerBatchLimit' => 2, -- 2.25.1