Merge pull request #15882 from demeritcowboy/audit-timeline

dev/core#1366 - Make case activity audit print report work again
civicrm · Nov 26, 2019 · 00e7a58 · 00e7a58
2 parents a84e551 + 5ae1ea3
commit 00e7a58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php
@@ -177,13 +177,6 @@ public function getActivities($clientID, $caseID, $activityTypes, &$activities)
       $map[$aType['id']] = $aType;
     }
 
-    // get all core activities
-    $coreActivityTypes = CRM_Case_PseudoConstant::caseActivityType(FALSE, TRUE);
-
-    foreach ($coreActivityTypes as $aType) {
-      $map[$aType['id']] = $aType;
-    }
-
     $activityTypeIDs = implode(',', array_keys($map));
     $query = "
 SELECT a.*, c.id as caseID
@@ -776,7 +769,7 @@ public static function populateCaseReportTemplate($clientID, $caseID, $activityS
       $activityTypes = $form->getActivityTypes($xml, $activitySetName);
     }
     else {
-      $activityTypes = CRM_Case_XMLProcessor::allActivityTypes();
+      $activityTypes = CRM_Case_XMLProcessor::allActivityTypes(FALSE, TRUE);
     }
 
     if (!$activityTypes) {

diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
@@ -103,7 +103,7 @@
     <div>
       <p>
         {if $hasAccessToAllCases}
-          <a class="crm-hover-button action-item no-popup" href="{crmURL p='civicrm/case/report/print' q="all=1&redact=0&cid=$contactID&caseID=$caseId&asn=standard_timeline"}"><i class="crm-i fa-print"></i> {ts}Print Report{/ts}</a>
+          <a class="crm-hover-button action-item no-popup" href="{crmURL p='civicrm/case/report/print' q="all=1&redact=0&cid=$contactID&caseID=$caseId&asn="}"><i class="crm-i fa-print"></i> {ts}Print Report{/ts}</a>
         {/if}
 
         {if !empty($exportDoc)}