From 10a6a65962873def0c2288cd62fd09db94d0bae4 Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Tue, 22 Aug 2017 16:17:38 -0400 Subject: [PATCH 1/2] CRM-21094 - improve layout order of fields in SurveyDetails report --- CRM/Report/Form/Campaign/SurveyDetails.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Report/Form/Campaign/SurveyDetails.php b/CRM/Report/Form/Campaign/SurveyDetails.php index d5c7b58e69f2..434d79467c1d 100644 --- a/CRM/Report/Form/Campaign/SurveyDetails.php +++ b/CRM/Report/Form/Campaign/SurveyDetails.php @@ -157,7 +157,8 @@ public function __construct() { ), 'grouping' => 'location-fields', ), - 'civicrm_activity' => array( + ) + $this->getAddressColumns() + + array('civicrm_activity' => array( 'dao' => 'CRM_Activity_DAO_Activity', 'alias' => 'survey_activity', 'fields' => array( @@ -206,8 +207,8 @@ public function __construct() { ), ), 'grouping' => 'survey-activity-fields', - ), - ) + $this->getAddressColumns(); + ) + ); parent::__construct(); } From ee8628be5479e24420cacf20243150446112aef0 Mon Sep 17 00:00:00 2001 From: Jamie McClelland Date: Wed, 23 Aug 2017 18:25:23 -0400 Subject: [PATCH 2/2] CRM-21094 - formatting fixes --- CRM/Report/Form/Campaign/SurveyDetails.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CRM/Report/Form/Campaign/SurveyDetails.php b/CRM/Report/Form/Campaign/SurveyDetails.php index 434d79467c1d..774fab8f4243 100644 --- a/CRM/Report/Form/Campaign/SurveyDetails.php +++ b/CRM/Report/Form/Campaign/SurveyDetails.php @@ -158,7 +158,8 @@ public function __construct() { 'grouping' => 'location-fields', ), ) + $this->getAddressColumns() + - array('civicrm_activity' => array( + array( + 'civicrm_activity' => array( 'dao' => 'CRM_Activity_DAO_Activity', 'alias' => 'survey_activity', 'fields' => array( @@ -207,7 +208,7 @@ public function __construct() { ), ), 'grouping' => 'survey-activity-fields', - ) + ), ); parent::__construct(); }