Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[REF] stop overriding postProcess function in activity report detail #17194

Merged
merged 1 commit into from
Apr 30, 2020
Merged

[REF] stop overriding postProcess function in activity report detail #17194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions CRM/Report/Form/Activity.php
View file
Open in desktop
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