Merge pull request #17194 from eileenmcnaughton/act_report

[REF] stop overriding postProcess function in activity report detail
civicrm · Apr 30, 2020 · 45f4a87 · 45f4a87
2 parents 21586d7 + c6f4d60
commit 45f4a87
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php
@@ -832,24 +832,13 @@ public function buildQuery($applyLimit = TRUE) {
     return $sql;
   }
 
-  public function postProcess() {
-    //reset value of activity_date
+  /**
+   * Override parent to reset value of activity_date.
+   */
+  public function beginPostProcessCommon() {
     if (!empty($this->_resetDateFilter)) {
-      $this->_formValues["activity_date_time_relative"] = NULL;
+      $this->_formValues['activity_date_time_relative'] = NULL;
     }
-
-    $this->beginPostProcess();
-    $sql = $this->buildQuery(TRUE);
-    $this->buildRows($sql, $rows);
-
-    // format result set.
-    $this->formatDisplay($rows);
-
-    // assign variables to templates
-    $this->doTemplateAssignment($rows);
-
-    // do print / pdf / instance stuff if needed
-    $this->endPostProcess($rows);
   }
 
   /**
@@ -860,6 +849,8 @@ public function postProcess() {
    *
    * @param array $rows
    *   Rows generated by SQL, with an array for each row.
+   *
+   * @throws \CRM_Core_Exception
    */
   public function alterDisplay(&$rows) {
     $entryFound = FALSE;