From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Tue, 4 Feb 2014 01:42:40 +0000 (+1300)
Subject: Fix e-notice on Case/Demographics report so it does not need to be excluded from... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=54071e11e67bf91c6a4848273506fc4f3708d8b8;p=civicrm-core.git

Fix e-notice on Case/Demographics report so it does not need to be excluded from test
---

diff --git a/CRM/Report/Form/Case/Demographics.php b/CRM/Report/Form/Case/Demographics.php
index 2f38aaed3f..c66ff2edbd 100644
--- a/CRM/Report/Form/Case/Demographics.php
+++ b/CRM/Report/Form/Case/Demographics.php
@@ -68,8 +68,10 @@ class CRM_Report_Form_Case_Demographics extends CRM_Report_Form {
         ),
         'filters' =>
         array(
-          'sort_name' =>
-          array('title' => ts('Contact Name')),
+          'sort_name' => array(
+            'title' => ts('Contact Name'),
+            'operatorType' => CRM_Report_Form::OP_STRING,
+          ),
           'contact_type' =>
           array('title' => ts('Contact Type'),
             'operatorType' => CRM_Report_Form::OP_SELECT,
@@ -321,7 +323,7 @@ where (cg.extends='Contact' OR cg.extends='Individual' OR cg.extends_entity_colu
             $from     = CRM_Utils_Array::value("{$fieldName}_from", $this->_params);
             $to       = CRM_Utils_Array::value("{$fieldName}_to", $this->_params);
 
-            $clause = $this->dateClause($field['dbAlias'], $relative, $from, $to, CRM_Utils_type::T_DATE);
+            $clause = $this->dateClause($field['dbAlias'], $relative, $from, $to, CRM_Utils_Type::T_DATE);
           }
           else {
             $op = CRM_Utils_Array::value("{$fieldName}_op", $this->_params);
diff --git a/tests/phpunit/api/v3/ReportTemplateTest.php b/tests/phpunit/api/v3/ReportTemplateTest.php
index 36fbeb6116..2e0155effb 100644
--- a/tests/phpunit/api/v3/ReportTemplateTest.php
+++ b/tests/phpunit/api/v3/ReportTemplateTest.php
@@ -182,7 +182,6 @@ class api_v3_ReportTemplateTest extends CiviUnitTestCase {
         'contribute/lybunt' => 'same as sybunt - fatals on force url & test identifies why',
         'event/income' => 'I do no understant why but error is Call to undefined method CRM_Report_Form_Event_Income::from() in CRM/Report/Form.php on line 2120',
         'contact/relationship' => '(see contribute/repeat), property declaration issue, Undefined property: CRM_Report_Form_Contact_Relationship::$relationType in /Contact/Relationship.php(486):',
-        'case/demographics' => 'Undefined index: operatorType Case/Demographics.php(319)',
         'activitySummary' => 'Undefined index: group_bys_freq m/ActivitySummary.php(191)',
         'event/incomesummary' => 'Undefined index: title, Report/Form/Event/IncomeCountSummary.php(187)',
         'logging/contact/summary' => '(likely to be test releated) probably logging off Undefined index: Form/Contact/LoggingSummary.php(231): PHP',