projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff4c746
)
--Fix notices on Activities report
author
Nileema
<nileema@nileema.(none)>
Fri, 6 Jun 2014 15:40:00 +0000
(21:10 +0530)
committer
Nileema
<nileema@nileema.(none)>
Fri, 6 Jun 2014 15:40:00 +0000
(21:10 +0530)
CRM/Report/Form/Activity.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Report/Form/Activity.php
b/CRM/Report/Form/Activity.php
index 63b70e7df6ea900d722ec9a7239b7c438c489d98..f46b8639efef7946981613f7726f7e14a88d734d 100644
(file)
--- a/
CRM/Report/Form/Activity.php
+++ b/
CRM/Report/Form/Activity.php
@@
-490,6
+490,10
@@
class CRM_Report_Form_Activity extends CRM_Report_Form {
CRM_Utils_Array::value("{$fieldName}_min", $this->_params),
CRM_Utils_Array::value("{$fieldName}_max", $this->_params)
);
+ if ($fieldName == 'activity_type_id' && empty($this->_params['activity_type_id_value'])) {
+ $actTypes = array_flip(CRM_Core_PseudoConstant::activityType(TRUE, FALSE, FALSE, 'label', TRUE));
+ $clause = "( {$this->_aliases['civicrm_activity']}.activity_type_id IN (".implode(',',$actTypes).") )";
+ }
}
}