From 16e2e80cfacf49c5fcd1c47cb77ed35593aa0323 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Fri, 22 Aug 2014 17:15:43 +0100 Subject: [PATCH] Ensure reports use nested group selector and remove boilerplate --- CRM/Report/Form.php | 2 +- CRM/Report/Form/Case/Demographics.php | 17 +--------------- CRM/Report/Form/Contact/Detail.php | 18 +---------------- CRM/Report/Form/Contact/Relationship.php | 17 +--------------- CRM/Report/Form/Contact/Summary.php | 17 +--------------- CRM/Report/Form/Contribute/Bookkeeping.php | 17 +--------------- CRM/Report/Form/Contribute/Detail.php | 18 +---------------- CRM/Report/Form/Contribute/History.php | 18 +---------------- CRM/Report/Form/Contribute/Lybunt.php | 17 +--------------- CRM/Report/Form/Contribute/Repeat.php | 17 +--------------- CRM/Report/Form/Contribute/SoftCredit.php | 17 +--------------- CRM/Report/Form/Contribute/Summary.php | 20 ++----------------- CRM/Report/Form/Contribute/Sybunt.php | 17 +--------------- CRM/Report/Form/Contribute/TopDonor.php | 17 +--------------- CRM/Report/Form/Mailing/Bounce.php | 15 +------------- CRM/Report/Form/Mailing/Clicks.php | 15 +------------- CRM/Report/Form/Mailing/Detail.php | 17 ++-------------- CRM/Report/Form/Mailing/Opened.php | 15 +------------- CRM/Report/Form/Member/ContributionDetail.php | 17 +--------------- CRM/Report/Form/Member/Lapse.php | 17 +--------------- CRM/Report/Form/Pledge/Detail.php | 17 +--------------- CRM/Report/Form/Pledge/Summary.php | 17 +--------------- 22 files changed, 24 insertions(+), 335 deletions(-) diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index cb0f65c7aa..e49e9da272 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.php @@ -1282,7 +1282,7 @@ class CRM_Report_Form extends CRM_Core_Form { 'title' => ts('Group'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), + 'options' => CRM_Core_PseudoConstant::nestedGroup(), ), ); if (empty($this->_columns['civicrm_group']['dao'])) { diff --git a/CRM/Report/Form/Case/Demographics.php b/CRM/Report/Form/Case/Demographics.php index a24a644514..15da828f56 100644 --- a/CRM/Report/Form/Case/Demographics.php +++ b/CRM/Report/Form/Case/Demographics.php @@ -189,24 +189,9 @@ class CRM_Report_Form_Case_Demographics extends CRM_Report_Form { ), ), ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; $open_case_val = CRM_Core_OptionGroup::getValue('activity_type', 'Open Case', 'name'); diff --git a/CRM/Report/Form/Contact/Detail.php b/CRM/Report/Form/Contact/Detail.php index c36a1c58c8..87917f3b13 100644 --- a/CRM/Report/Form/Contact/Detail.php +++ b/CRM/Report/Form/Contact/Detail.php @@ -356,22 +356,6 @@ class CRM_Report_Form_Contact_Detail extends CRM_Report_Form { ), 'grouping' => 'activity-fields', ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), 'civicrm_phone' => array( 'dao' => 'CRM_Core_DAO_Phone', @@ -386,7 +370,7 @@ class CRM_Report_Form_Contact_Detail extends CRM_Report_Form { 'grouping' => 'contact-fields', ), ); - + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Contact/Relationship.php b/CRM/Report/Form/Contact/Relationship.php index e915ee4036..1eaa692145 100644 --- a/CRM/Report/Form/Contact/Relationship.php +++ b/CRM/Report/Form/Contact/Relationship.php @@ -287,24 +287,9 @@ class CRM_Report_Form_Contact_Relationship extends CRM_Report_Form { ), 'grouping' => 'contact-fields', ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Contact/Summary.php b/CRM/Report/Form/Contact/Summary.php index e8bc442e93..44d2611616 100644 --- a/CRM/Report/Form/Contact/Summary.php +++ b/CRM/Report/Form/Contact/Summary.php @@ -196,24 +196,9 @@ class CRM_Report_Form_Contact_Summary extends CRM_Report_Form { ), 'grouping' => 'contact-fields', ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php index 4070d5b3d7..d1e7961e0a 100644 --- a/CRM/Report/Form/Contribute/Bookkeeping.php +++ b/CRM/Report/Form/Contribute/Bookkeeping.php @@ -278,24 +278,9 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { array('title' => ts('Amount')), ), ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php index 0d9d2bae80..6042bda568 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -266,23 +266,6 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { ), ), ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_GroupContact', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - 'type' => CRM_Utils_Type::T_INT, - ), - ), - ), 'civicrm_contribution_ordinality' => array( 'dao' => 'CRM_Contribute_DAO_Contribution', @@ -324,6 +307,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { ), ) + $this->addAddressFields(FALSE); + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; // Don't show Batch display column and filter unless batches are being used diff --git a/CRM/Report/Form/Contribute/History.php b/CRM/Report/Form/Contribute/History.php index 9dc0b0ce8c..37a0e4e63e 100644 --- a/CRM/Report/Form/Contribute/History.php +++ b/CRM/Report/Form/Contribute/History.php @@ -231,23 +231,6 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form { ), ), ), - ) + array( - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_GroupContact', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); $this->_columns['civicrm_contribution']['fields']['civicrm_upto_' . $this->_yearStatisticsFrom] = array('title' => ts('Up To %1 Donation', array(1 => $this->_yearStatisticsFrom)), @@ -272,6 +255,7 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form { 'is_statistics' => TRUE, ); + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php index ccd06d2b2d..874deb19f2 100644 --- a/CRM/Report/Form/Contribute/Lybunt.php +++ b/CRM/Report/Form/Contribute/Lybunt.php @@ -180,22 +180,6 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form { ), ), ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_GroupContact', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); // If we have a campaign, build out the relevant elements @@ -210,6 +194,7 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form { ); } + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php index 35bec198ba..ab2b2b7d91 100644 --- a/CRM/Report/Form/Contribute/Repeat.php +++ b/CRM/Report/Form/Contribute/Repeat.php @@ -243,24 +243,9 @@ contribution_civireport2.total_amount_sum as contribution2_total_amount_sum', ), 'group_bys' => array('contribution_source' => NULL), ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_GroupContact', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php index e2982572ca..afff9e4154 100644 --- a/CRM/Report/Form/Contribute/SoftCredit.php +++ b/CRM/Report/Form/Contribute/SoftCredit.php @@ -241,22 +241,6 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { ), 'grouping' => 'softcredit-fields', ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_GroupContact', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Soft Credit Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); // If we have a campaign, build out the relevant elements @@ -271,6 +255,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { ); } + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; $this->_currencyColumn = 'civicrm_contribution_currency'; diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php index f0412b4e2d..ef4023d85a 100644 --- a/CRM/Report/Form/Contribute/Summary.php +++ b/CRM/Report/Form/Contribute/Summary.php @@ -264,27 +264,9 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { ), ), ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_GroupContact', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - 'type' => CRM_Utils_Type::T_INT, - ), - ), - ), ) + $this->addAddressFields(); // If we have a campaign, build out the relevant elements - $this->_tagFilter = TRUE; if ($campaignEnabled && !empty($this->activeCampaigns)) { $this->_columns['civicrm_contribution']['fields']['campaign_id'] = array( 'title' => 'Campaign', @@ -297,6 +279,8 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { $this->_columns['civicrm_contribution']['group_bys']['campaign_id'] = array('title' => ts('Campaign')); } + $this->_tagFilter = TRUE; + $this->_groupFilter = TRUE; $this->_currencyColumn = 'civicrm_contribution_currency'; parent::__construct(); } diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php index 928aee0d32..fcb778f592 100644 --- a/CRM/Report/Form/Contribute/Sybunt.php +++ b/CRM/Report/Form/Contribute/Sybunt.php @@ -176,22 +176,6 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { ), ), ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_GroupContact', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); // If we have a campaign, build out the relevant elements @@ -206,6 +190,7 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { ); } + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php index 8ac8208546..25297045f1 100644 --- a/CRM/Report/Form/Contribute/TopDonor.php +++ b/CRM/Report/Form/Contribute/TopDonor.php @@ -166,24 +166,9 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form { ), 'grouping' => 'phone-fields', ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_GroupContact', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; $this->_currencyColumn = 'civicrm_contribution_currency'; parent::__construct(); diff --git a/CRM/Report/Form/Mailing/Bounce.php b/CRM/Report/Form/Mailing/Bounce.php index 830606b70a..47d9603f9c 100644 --- a/CRM/Report/Form/Mailing/Bounce.php +++ b/CRM/Report/Form/Mailing/Bounce.php @@ -197,20 +197,7 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form { 'grouping' => 'contact-fields', ); - $this->_columns['civicrm_group'] = array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => array( - 'gid' => array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ); - + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Mailing/Clicks.php b/CRM/Report/Form/Mailing/Clicks.php index 1c8e2c9577..9fdda34531 100644 --- a/CRM/Report/Form/Mailing/Clicks.php +++ b/CRM/Report/Form/Mailing/Clicks.php @@ -160,20 +160,7 @@ class CRM_Report_Form_Mailing_Clicks extends CRM_Report_Form { 'grouping' => 'mailing-fields', ); - $this->_columns['civicrm_group'] = array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => array( - 'gid' => array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ); - + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Mailing/Detail.php b/CRM/Report/Form/Mailing/Detail.php index 735f23aebd..8a182c971e 100644 --- a/CRM/Report/Form/Mailing/Detail.php +++ b/CRM/Report/Form/Mailing/Detail.php @@ -263,21 +263,8 @@ class CRM_Report_Form_Mailing_Detail extends CRM_Report_Form { 'grouping' => 'contact-fields', ); - $this->_columns['civicrm_group'] = array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ); + $this->_groupFilter = TRUE; + $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Mailing/Opened.php b/CRM/Report/Form/Mailing/Opened.php index f5286a0c5a..4a7b94df81 100644 --- a/CRM/Report/Form/Mailing/Opened.php +++ b/CRM/Report/Form/Mailing/Opened.php @@ -151,20 +151,7 @@ class CRM_Report_Form_Mailing_Opened extends CRM_Report_Form { 'grouping' => 'contact-fields', ); - $this->_columns['civicrm_group'] = array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => array( - 'gid' => array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ); - + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php index eb132f8926..98b128af6c 100644 --- a/CRM/Report/Form/Member/ContributionDetail.php +++ b/CRM/Report/Form/Member/ContributionDetail.php @@ -258,22 +258,6 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form { ), ), ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_GroupContact', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), 'civicrm_contribution_ordinality' => array( 'dao' => 'CRM_Contribute_DAO_Contribution', @@ -381,6 +365,7 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form { ), ) + $this->addAddressFields(FALSE); + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; // Don't show Batch display column and filter unless batches are being used diff --git a/CRM/Report/Form/Member/Lapse.php b/CRM/Report/Form/Member/Lapse.php index 1b4a8067a6..3c6cc56b7f 100644 --- a/CRM/Report/Form/Member/Lapse.php +++ b/CRM/Report/Form/Member/Lapse.php @@ -194,22 +194,6 @@ class CRM_Report_Form_Member_Lapse extends CRM_Report_Form { array('email' => NULL), 'grouping' => 'contact-fields', ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_GroupContact', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts('Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ); // If we have a campaign, build out the relevant elements @@ -224,6 +208,7 @@ class CRM_Report_Form_Member_Lapse extends CRM_Report_Form { ); } + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; parent::__construct(); } diff --git a/CRM/Report/Form/Pledge/Detail.php b/CRM/Report/Form/Pledge/Detail.php index cae2305b56..60216bd389 100644 --- a/CRM/Report/Form/Pledge/Detail.php +++ b/CRM/Report/Form/Pledge/Detail.php @@ -195,22 +195,6 @@ class CRM_Report_Form_Pledge_Detail extends CRM_Report_Form { ), ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts(' Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ) ) + $this->getAddressColumns(array('group_by' => FALSE)) + $this->getPhoneColumns(); @@ -229,6 +213,7 @@ class CRM_Report_Form_Pledge_Detail extends CRM_Report_Form { } + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; $this->_currencyColumn = 'civicrm_pledge_currency'; parent::__construct(); diff --git a/CRM/Report/Form/Pledge/Summary.php b/CRM/Report/Form/Pledge/Summary.php index d0782a7049..35fcc785cf 100644 --- a/CRM/Report/Form/Pledge/Summary.php +++ b/CRM/Report/Form/Pledge/Summary.php @@ -190,24 +190,9 @@ class CRM_Report_Form_Pledge_Summary extends CRM_Report_Form { ), ), ), - 'civicrm_group' => - array( - 'dao' => 'CRM_Contact_DAO_Group', - 'alias' => 'cgroup', - 'filters' => - array( - 'gid' => - array( - 'name' => 'group_id', - 'title' => ts(' Group'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'group' => TRUE, - 'options' => CRM_Core_PseudoConstant::group(), - ), - ), - ), ) + $this->addAddressFields(); + $this->_groupFilter = TRUE; $this->_tagFilter = TRUE; $this->_currencyColumn = 'civicrm_pledge_currency'; parent::__construct(); -- 2.25.1