Skip to content

Commit

Permalink
[REF] stop overriding postProcess function in activity report detail
Browse files Browse the repository at this point in the history
The function is the same as master except one extra thing that can be done in the function intended for
report-specific preProcess overrides
  • Loading branch information
eileenmcnaughton committed Apr 30, 2020
1 parent 21586d7 commit c6f4d60
Showing 1 changed file with 7 additions and 16 deletions.
23 changes: 7 additions & 16 deletions CRM/Report/Form/Activity.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand All @@ -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;
Expand Down

0 comments on commit c6f4d60

Please sign in to comment.