From: Web Access Date: Tue, 29 Mar 2016 11:20:49 +0000 (+0530) Subject: Fix for CRM-18060 X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=942b1d01fb9dfafd4168ed4cf14b01af9866bc55;p=civicrm-core.git Fix for CRM-18060 --- diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php index 81befa3671..0722974e41 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -375,6 +375,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); $this->_columns['civicrm_contribution']['order_bys']['campaign_id'] = array('title' => ts('Campaign')); } diff --git a/CRM/Report/Form/Contribute/HouseholdSummary.php b/CRM/Report/Form/Contribute/HouseholdSummary.php index a6d8ed9c45..dc6954062a 100644 --- a/CRM/Report/Form/Contribute/HouseholdSummary.php +++ b/CRM/Report/Form/Contribute/HouseholdSummary.php @@ -194,6 +194,7 @@ class CRM_Report_Form_Contribute_HouseholdSummary extends CRM_Report_Form { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); } $this->_currencyColumn = 'civicrm_contribution_currency'; diff --git a/CRM/Report/Form/Contribute/OrganizationSummary.php b/CRM/Report/Form/Contribute/OrganizationSummary.php index 4d30b08bfd..cc8b2cc9c0 100644 --- a/CRM/Report/Form/Contribute/OrganizationSummary.php +++ b/CRM/Report/Form/Contribute/OrganizationSummary.php @@ -204,6 +204,7 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); } diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php index a3318c55dc..c9058223e7 100644 --- a/CRM/Report/Form/Contribute/SoftCredit.php +++ b/CRM/Report/Form/Contribute/SoftCredit.php @@ -301,6 +301,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); } diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php index 5752ba9f57..1625378f68 100644 --- a/CRM/Report/Form/Contribute/Sybunt.php +++ b/CRM/Report/Form/Contribute/Sybunt.php @@ -248,6 +248,7 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); } diff --git a/CRM/Report/Form/Event/ParticipantListing.php b/CRM/Report/Form/Event/ParticipantListing.php index b4e3843155..3497a4a84d 100644 --- a/CRM/Report/Form/Event/ParticipantListing.php +++ b/CRM/Report/Form/Event/ParticipantListing.php @@ -411,6 +411,7 @@ class CRM_Report_Form_Event_ParticipantListing extends CRM_Report_Form_Event { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); $this->_columns['civicrm_participant']['order_bys']['campaign_id'] = array( 'title' => ts('Campaign'), diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php index d8a65f98f0..54b9c113fe 100644 --- a/CRM/Report/Form/Member/ContributionDetail.php +++ b/CRM/Report/Form/Member/ContributionDetail.php @@ -378,6 +378,7 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); $this->_columns['civicrm_contribution']['order_bys']['campaign_id'] = array('title' => ts('Campaign')); } diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php index 77e8ac926a..cd6ed27ad8 100644 --- a/CRM/Report/Form/Member/Detail.php +++ b/CRM/Report/Form/Member/Detail.php @@ -247,6 +247,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); $this->_columns['civicrm_membership']['order_bys']['campaign_id'] = array('title' => ts('Campaign')); diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php index 9baf5b7ee7..d5400f5e56 100644 --- a/CRM/Report/Form/Member/Summary.php +++ b/CRM/Report/Form/Member/Summary.php @@ -186,6 +186,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); $this->_columns['civicrm_membership']['group_bys']['campaign_id'] = array('title' => ts('Campaign')); } diff --git a/CRM/Report/Form/Pledge/Detail.php b/CRM/Report/Form/Pledge/Detail.php index e900d5257b..0190fa10fa 100644 --- a/CRM/Report/Form/Pledge/Detail.php +++ b/CRM/Report/Form/Pledge/Detail.php @@ -197,6 +197,7 @@ class CRM_Report_Form_Pledge_Detail extends CRM_Report_Form { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); $this->_columns['civicrm_pledge']['group_bys']['campaign_id'] = array('title' => ts('Campaign')); diff --git a/CRM/Report/Form/Pledge/Pbnp.php b/CRM/Report/Form/Pledge/Pbnp.php index 3181082ad2..c1e0cb3643 100644 --- a/CRM/Report/Form/Pledge/Pbnp.php +++ b/CRM/Report/Form/Pledge/Pbnp.php @@ -185,6 +185,7 @@ class CRM_Report_Form_Pledge_Pbnp extends CRM_Report_Form { 'title' => ts('Campaign'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, 'options' => $this->activeCampaigns, + 'type' => CRM_Utils_Type::T_INT, ); }