From 537193e6796a28682805891623b352d1e68ecaa7 Mon Sep 17 00:00:00 2001 From: yashodha Date: Tue, 17 Jan 2017 12:43:47 +0530 Subject: [PATCH] minor fix --- CRM/Activity/BAO/Query.php | 8 ++++---- CRM/Report/Form/Activity.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php index 12176e85e4..2d1c46a9da 100644 --- a/CRM/Activity/BAO/Query.php +++ b/CRM/Activity/BAO/Query.php @@ -395,10 +395,10 @@ class CRM_Activity_BAO_Query { break; case 'activity_priority': - $from .= " $side JOIN civicrm_option_group option_group_activity_priority ON (option_group_activity_priority.name = 'priority')"; - $from .= " $side JOIN civicrm_option_value activity_priority ON (civicrm_activity.priority_id = activity_priority.value - AND option_group_activity_priority.id = activity_priority.option_group_id ) "; - break; + $from .= " $side JOIN civicrm_option_group option_group_activity_priority ON (option_group_activity_priority.name = 'priority')"; + $from .= " $side JOIN civicrm_option_value activity_priority ON (civicrm_activity.priority_id = activity_priority.value + AND option_group_activity_priority.id = activity_priority.option_group_id ) "; + break; case 'civicrm_activity_tag': $from .= " $side JOIN civicrm_entity_tag as civicrm_activity_tag ON ( civicrm_activity_tag.entity_table = 'civicrm_activity' AND civicrm_activity_tag.entity_id = civicrm_activity.id ) "; diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php index 27ff5f266c..8fee27e888 100644 --- a/CRM/Report/Form/Activity.php +++ b/CRM/Report/Form/Activity.php @@ -243,9 +243,9 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { 'type' => CRM_Utils_Type::T_TEXT, ), 'priority_id' => array( - 'title' => ts('Activity Priority'), - 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Core_PseudoConstant::get('CRM_Activity_DAO_Activity', 'priority_id'), + 'title' => ts('Activity Priority'), + 'operatorType' => CRM_Report_Form::OP_MULTISELECT, + 'options' => CRM_Core_PseudoConstant::get('CRM_Activity_DAO_Activity', 'priority_id'), ), ), 'order_bys' => array( -- 2.25.1