dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4168 from AdrianFretwell/master 

Update contacts.php default sort order
This commit is contained in:
FusionPBX 2019-05-30 00:35:51 -06:00 committed by GitHub
parent ce779f7e31 dad2318f23
commit 2a2efd0d5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/contacts/contacts.php
View File

@ -178,12 +178,15 @@
$offset = $rows_per_page * $page;
//get the list
$contact_default_sort_col = ($_SESSION['contacts']['default_sort_column']['text'] != '') ? $_SESSION['contacts']['default_sort_column']['text'] : "last_mod_date";
$contact_default_sort_ord = ($_SESSION['contacts']['default_sort_order']['text'] != '') ? $_SESSION['contacts']['default_sort_order']['text'] : "desc";
$sql = str_replace('count(*) as num_rows', '*, (select a.contact_attachment_uuid from v_contact_attachments as a where a.contact_uuid = c.contact_uuid and a.attachment_primary = 1) as contact_attachment_uuid', $sql);
if (strlen($order_by) > 0) {
$sql .= "order by ".$order_by." ".$order." ";
$sql .= "order by ".$order_by." ".$order.", contact_organization asc ";
}
else {
$sql .= "order by last_mod_date desc ";
$sql .= "order by ".$contact_default_sort_col." ".$contact_default_sort_ord." ";
if ($db_type == "pgsql") {
$sql .= "nulls last ";
}