Skip to content

Commit

Permalink
Merge pull request #1035 from compucorp/comcl-714-fix-activity-report…
Browse files Browse the repository at this point in the history
…-page

COMCL-714: Fix Case Activity Report
  • Loading branch information
shahrukh-compuco authored Aug 19, 2024
2 parents 431cb63 + bae28d3 commit 9368043
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions CRM/Civicase/XMLProcessor/Report.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public static function getCaseReport($clientID, $caseID, $activitySetName, $para
$template->assign('caseId', $caseID);
$template->assign('clientID', $clientID);
$template->assign('activitySetName', $activitySetName);
$allActivityTypes = CRM_Case_PseudoConstant::caseActivityType();

if (!empty($params['is_redact'])) {
$report->_isRedact = TRUE;
Expand Down Expand Up @@ -96,10 +97,10 @@ public static function getCaseReport($clientID, $caseID, $activitySetName, $para

if ($activitySetName && !empty($activitySetNames[$activitySetName])) {
$timelineActivities = $report->getActivityTypes($xml, $activitySetName);
$activityTypes = !empty($timelineActivities) ? $timelineActivities : CRM_Case_XMLProcessor::allActivityTypes();
$activityTypes = !empty($timelineActivities) ? $timelineActivities : $allActivityTypes;
}
else {
$activityTypes = CRM_Case_XMLProcessor::allActivityTypes();
$activityTypes = $allActivityTypes;
}

if (!$activityTypes) {
Expand Down

0 comments on commit 9368043

Please sign in to comment.