CRM-20369 mailing bounce report

diff --git a/CRM/Report/Form/Mailing/Bounce.php b/CRM/Report/Form/Mailing/Bounce.php
index 056f876e84c99772273bf03f63d3c8427be0de4a..70a63f9a098c0d362e7a00fda2de5a12e677337c 100644 (file)
--- a/CRM/Report/Form/Mailing/Bounce.php
+++ b/CRM/Report/Form/Mailing/Bounce.php
@@ -110,7 +110,7 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
       'fields' => array(
         'mailing_name' => array(
           'name' => 'name',
-          'title' => ts('Mailing'),
+          'title' => ts('Mailing Name'),
           'default' => TRUE,
         ),
         'mailing_name_alias' => array(
@@ -118,21 +118,36 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
           'required' => TRUE,
           'no_display' => TRUE,
         ),
+        'mailing_subject' => array(
+          'name' => 'subject',
+          'title' => ts('Mailing Subject'),
+          'default' => true,
+        ),
       ),
       'filters' => array(
         'mailing_id' => array(
           'name' => 'id',
-          'title' => ts('Mailing'),
+          'title' => ts('Mailing Name'),
           'operatorType' => CRM_Report_Form::OP_MULTISELECT,
           'type' => CRM_Utils_Type::T_INT,
           'options' => CRM_Mailing_BAO_Mailing::getMailingsList(),
           'operator' => 'like',
         ),
+        'mailing_subject' => array(
+          'name' => 'subject',
+          'title' => ts('Mailing Subject'),
+          'type'=> CRM_Utils_Type::T_STRING,
+          'operator' => 'like',
+        ),
       ),
       'order_bys' => array(
         'mailing_name' => array(
           'name' => 'name',
-          'title' => ts('Mailing'),
+          'title' => ts('Mailing Name'),
+        ),
+        'mailing_subject' => array(
+          'name' => 'subject',
+          'title' => ts('Mailing Subject'),
         ),
       ),
       'grouping' => 'mailing-fields',
@@ -182,7 +197,7 @@ class CRM_Report_Form_Mailing_Bounce extends CRM_Report_Form {
         'bounce_type_name' => array(
           'name' => 'name',
           'title' => ts('Bounce Type'),
-          'operatorType' => CRM_Report_Form::OP_SELECT,
+          'operatorType' => CRM_Report_Form::OP_MULTISELECT,
           'type' => CRM_Utils_Type::T_STRING,
           'options' => self::bounce_type(),
           'operator' => 'like',