From: Eileen McNaughton Date: Tue, 30 Nov 2021 20:09:49 +0000 (+1300) Subject: [Smarty variables] remove isset from case dashboard X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b2f5ab72daf24a61366ecb3204fc70392b95c26d;p=civicrm-core.git [Smarty variables] remove isset from case dashboard --- diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index 5014e4a0cd..f28721991b 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -761,6 +761,9 @@ SELECT civicrm_case.id, case_status.label AS case_status, status_id, civicrm_cas $res = CRM_Core_DAO::executeQuery($query); while ($res->fetch()) { + if (!isset($rows[$res->case_type])) { + $rows[$res->case_type] = array_fill_keys($caseStatuses, []); + } if (!empty($rows[$res->case_type]) && !empty($rows[$res->case_type][$res->case_status])) { $rows[$res->case_type][$res->case_status]['count'] = $rows[$res->case_type][$res->case_status]['count'] + 1; } diff --git a/CRM/Case/Page/DashBoard.php b/CRM/Case/Page/DashBoard.php index 7a24af22ce..bfc8c1fe3a 100644 --- a/CRM/Case/Page/DashBoard.php +++ b/CRM/Case/Page/DashBoard.php @@ -46,8 +46,6 @@ class CRM_Case_Page_DashBoard extends CRM_Core_Page { CRM_Utils_System::setTitle(ts('CiviCase Dashboard')); - $userID = $session->get('userID'); - //validate access for all cases. if ($allCases && !CRM_Core_Permission::check('access all cases and activities')) { $allCases = 0; diff --git a/templates/CRM/Case/Page/DashBoard.tpl b/templates/CRM/Case/Page/DashBoard.tpl index 08797ceb7d..5ce2cca18e 100644 --- a/templates/CRM/Case/Page/DashBoard.tpl +++ b/templates/CRM/Case/Page/DashBoard.tpl @@ -56,7 +56,7 @@ {foreach from=$casesSummary.headers item=header} {assign var="caseStatus" value=$header.status} - {if isset($row.$caseStatus)} + {if is_array($row.$caseStatus)} {$row.$caseStatus.count} {else} 0 diff --git a/tests/phpunit/CRM/Core/FormTest.php b/tests/phpunit/CRM/Core/FormTest.php index d04858ec9c..8bd989acd7 100644 --- a/tests/phpunit/CRM/Core/FormTest.php +++ b/tests/phpunit/CRM/Core/FormTest.php @@ -17,7 +17,7 @@ class CRM_Core_FormTest extends CiviUnitTestCase { */ public function testOpeningForms(string $url): void { $this->createLoggedInUser(); - + \CRM_Core_BAO_ConfigSetting::enableComponent('CiviCase'); $_SERVER['REQUEST_URI'] = $url; $urlParts = explode('?', $url); $_GET['q'] = $urlParts[0];