From a5ca77376c7fce201034b3f076c80ba7bf8aa431 Mon Sep 17 00:00:00 2001 From: JKingsnorth Date: Fri, 19 Jan 2018 10:43:05 +0000 Subject: [PATCH] CRM-21683 Standardise filter in mailing summary report --- CRM/Report/Form/Mailing/Summary.php | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/CRM/Report/Form/Mailing/Summary.php b/CRM/Report/Form/Mailing/Summary.php index 612f7a0973..b7eaa0a917 100644 --- a/CRM/Report/Form/Mailing/Summary.php +++ b/CRM/Report/Form/Mailing/Summary.php @@ -85,12 +85,12 @@ class CRM_Report_Form_Mailing_Summary extends CRM_Report_Form { //'operator' => 'like', 'default' => 1, ), - 'mailing_name' => array( - 'name' => 'name', + 'mailing_id' => array( + 'name' => 'id', 'title' => ts('Mailing Name'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'type' => CRM_Utils_Type::T_STRING, - 'options' => self::mailing_select(), + 'type' => CRM_Utils_Type::T_INT, + 'options' => CRM_Mailing_BAO_Mailing::getMailingsList(), 'operator' => 'like', ), 'mailing_subject' => array( @@ -317,24 +317,6 @@ class CRM_Report_Form_Mailing_Summary extends CRM_Report_Form { parent::__construct(); } - /** - * @return array - */ - public function mailing_select() { - - $data = array(); - - $mailing = new CRM_Mailing_BAO_Mailing(); - $query = "SELECT name FROM civicrm_mailing WHERE sms_provider_id IS NULL"; - $mailing->query($query); - - while ($mailing->fetch()) { - $data[CRM_Core_DAO::escapeString($mailing->name)] = $mailing->name; - } - - return $data; - } - public function preProcess() { $this->assign('chartSupported', TRUE); parent::preProcess(); -- 2.25.1