From d13ce5f9f9155cca243e0cbd8487757a13faa8fe Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Sun, 2 Aug 2020 14:21:54 -0400 Subject: [PATCH] fix qill typo --- CRM/Case/BAO/Query.php | 2 +- tests/phpunit/CRM/Case/BAO/QueryTest.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CRM/Case/BAO/Query.php b/CRM/Case/BAO/Query.php index f1ab5119a4..7d793b6afc 100644 --- a/CRM/Case/BAO/Query.php +++ b/CRM/Case/BAO/Query.php @@ -376,7 +376,7 @@ class CRM_Case_BAO_Query extends CRM_Core_BAO_Query { } $query->_where[$grouping][] = CRM_Contact_BAO_Query::buildClause("case_activity.status_id", $op, $value, 'Int'); - $query->_qill[$grouping][] = ts("Activity Type %1 %2", [1 => $op, 2 => $names]); + $query->_qill[$grouping][] = ts("Activity Status %1 %2", [1 => $op, 2 => $names]); $query->_tables['case_activity'] = $query->_whereTables['case_activity'] = 1; $query->_tables['civicrm_case'] = $query->_whereTables['civicrm_case'] = 1; $query->_tables['case_activity_status'] = 1; diff --git a/tests/phpunit/CRM/Case/BAO/QueryTest.php b/tests/phpunit/CRM/Case/BAO/QueryTest.php index 1a4cc92cd6..da5573ad38 100644 --- a/tests/phpunit/CRM/Case/BAO/QueryTest.php +++ b/tests/phpunit/CRM/Case/BAO/QueryTest.php @@ -22,9 +22,6 @@ class CRM_Case_BAO_QueryTest extends CiviUnitTestCase { * CRM-17120 check the qill is still calculated after changing function used * to retrieve function. * - * Note that the Qill doesn't actually appear to have the correct labels to - * start with. I didn't attempt to fix that. I just prevented regression. - * * I could not find anyway to actually do this search with the relevant fields * as parameters & don't know if they exist as legitimate code or code cruft so * this test was the only way I could verify the change. @@ -61,7 +58,7 @@ class CRM_Case_BAO_QueryTest extends CiviUnitTestCase { $this->assertEquals( [ 0 => 'Activity Type = Contribution', - 1 => 'Activity Type = Scheduled', + 1 => 'Activity Status = Scheduled', 2 => 'Activity Medium = In Person', ], $queryObj->_qill[1] -- 2.25.1