From 09dad2809966267971592743485afdb432c73c1f Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Wed, 15 Nov 2017 12:29:39 -0500 Subject: [PATCH] Sort by country,second_name,first_name for pdf generation of international mailings (change currently disabled / commented out -- sudoman) --- CRM/Utils/Sort.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CRM/Utils/Sort.php b/CRM/Utils/Sort.php index 617e4c33e1..40a8c5c0aa 100644 --- a/CRM/Utils/Sort.php +++ b/CRM/Utils/Sort.php @@ -136,10 +136,18 @@ class CRM_Utils_Sort { $this->_vars[$this->_currentSortID]['direction'] == self::DONTCARE ) { $this->_vars[$this->_currentSortID]['name'] = str_replace(' ', '_', $this->_vars[$this->_currentSortID]['name']); + // quidam: hack to reorder by country,second_name,first_name on pdf generation + // un-comment next two lines to re-enable quidam's hack + //if ($this->_vars[$this->_currentSortID]['title'] == 'Country'){ + // return CRM_Utils_Type::escape($this->_vars[$this->_currentSortID]['name'], 'MysqlColumnNameOrAlias') . ' asc,last_name asc,first_name asc'; } return CRM_Utils_Type::escape($this->_vars[$this->_currentSortID]['name'], 'MysqlColumnNameOrAlias') . ' asc'; } else { $this->_vars[$this->_currentSortID]['name'] = str_replace(' ', '_', $this->_vars[$this->_currentSortID]['name']); + // quidam: hack to reorder by country,second_name,first_name on pdf generation + // un-comment next two lines to re-enable quidam's hack + //if ($this->_vars[$this->_currentSortID]['title'] == 'Country'){ + // return CRM_Utils_Type::escape($this->_vars[$this->_currentSortID]['name'], 'MysqlColumnNameOrAlias') . ' desc,last_name asc,first_name asc'; } return CRM_Utils_Type::escape($this->_vars[$this->_currentSortID]['name'], 'MysqlColumnNameOrAlias') . ' desc'; } } -- 2.25.1