From 42047ce4bac86cd5a21a9a7c2be2234d20e75d0b Mon Sep 17 00:00:00 2001 From: Nileema Date: Tue, 6 May 2014 12:07:53 +0530 Subject: [PATCH] --Modification to caseType PseudoConstant function call --- CRM/Case/Form/Activity/ChangeCaseType.php | 2 +- CRM/Logging/Differ.php | 2 +- CRM/Logging/ReportSummary.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CRM/Case/Form/Activity/ChangeCaseType.php b/CRM/Case/Form/Activity/ChangeCaseType.php index 25e9f13266..144826412a 100644 --- a/CRM/Case/Form/Activity/ChangeCaseType.php +++ b/CRM/Case/Form/Activity/ChangeCaseType.php @@ -135,7 +135,7 @@ class CRM_Case_Form_Activity_ChangeCaseType { } $caseTypes = CRM_Case_PseudoConstant::caseType('name'); - $allCaseTypes = CRM_Case_PseudoConstant::caseType('label', FALSE); + $allCaseTypes = CRM_Case_PseudoConstant::caseType('title', FALSE); if (!empty($caseTypes[$params['case_type_id']])) { $caseType = $caseTypes[$params['case_type_id']]; diff --git a/CRM/Logging/Differ.php b/CRM/Logging/Differ.php index d2bc59fe00..ac68cc6876 100644 --- a/CRM/Logging/Differ.php +++ b/CRM/Logging/Differ.php @@ -261,7 +261,7 @@ WHERE lt.log_conn_id = %1 AND 'suffix_id' => CRM_Contact_BAO_Contact::buildOptions('suffix_id'), 'website_type_id' => CRM_Core_PseudoConstant::get('CRM_Core_DAO_Website', 'website_type_id'), 'activity_type_id' => CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE), - 'case_type_id' => CRM_Case_PseudoConstant::caseType('label', FALSE), + 'case_type_id' => CRM_Case_PseudoConstant::caseType('title', FALSE), 'priority_id' => CRM_Core_PseudoConstant::get('CRM_Activity_DAO_Activity', 'priority_id'), ); diff --git a/CRM/Logging/ReportSummary.php b/CRM/Logging/ReportSummary.php index 6365588bf4..4cce97d00f 100644 --- a/CRM/Logging/ReportSummary.php +++ b/CRM/Logging/ReportSummary.php @@ -165,7 +165,7 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form { ), 'bracket_info' => array( 'entity_column' => 'case_type_id', - 'options' => CRM_Case_PseudoConstant::caseType('label', FALSE) + 'options' => CRM_Case_PseudoConstant::caseType('title', FALSE) ), ), ); @@ -181,7 +181,7 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form { // build _logTables for address custom tables $customTables = $logging->entityCustomDataLogTables('Address'); foreach ($customTables as $table) { - $this->_logTables[$table] = + $this->_logTables[$table] = array( 'fk' => 'contact_id',// for join of fk_table with contact table 'joins' => array( @@ -223,7 +223,7 @@ class CRM_Logging_ReportSummary extends CRM_Report_Form { function where() { // reset where clause as its called multiple times, every time insert sql is built. $this->_whereClauses = array(); - + parent::where(); $this->_where .= " AND (entity_log_civireport.log_action != 'Initialization')"; } -- 2.25.1