From 7f1ec901fba6ab40ddeda9261c990a32f8a52a25 Mon Sep 17 00:00:00 2001 From: Deepak Srivastava Date: Tue, 4 Jun 2013 12:38:52 +0530 Subject: [PATCH] notice fixes --- CRM/Report/Form.php | 2 +- CRM/Report/Form/Contribute/Summary.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index 4088c94243..0a17416244 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.php @@ -195,6 +195,7 @@ class CRM_Report_Form extends CRM_Core_Form { protected $_sections = NULL; protected $_autoIncludeIndexedFieldsAsOrderBys = 0; protected $_absoluteUrl = FALSE; + protected $_grandFlag = FALSE; /** * Flag to indicate if result-set is to be stored in a class variable which could be retrieved using getResultSet() method. @@ -1614,7 +1615,6 @@ WHERE cg.extends IN ('" . implode("','", $this->_customGroupExtends) . "') AND } $lastRow = array_pop($rows); - $this->_grandFlag = FALSE; foreach ($this->_columnHeaders as $fld => $val) { if (!in_array($fld, $this->_statFields)) { if (!$this->_grandFlag) { diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php index 273c4bcf75..6d5874eb85 100644 --- a/CRM/Report/Form/Contribute/Summary.php +++ b/CRM/Report/Form/Contribute/Summary.php @@ -123,7 +123,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { 'fields' => array( 'contribution_source' => array('title' => ts('Source'), - ), + ), 'currency' => array('required' => TRUE, 'no_display' => TRUE, @@ -227,7 +227,6 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, ); - $this->_columns['civicrm_contribution']['grouping']['campaign_id'] = 'contri-fields'; $this->_columns['civicrm_contribution']['group_bys']['campaign_id'] = array('title' => ts('Campaign')); } -- 2.25.1