From 3d2f28fde5a1e86eba05666da3710197dc9bd6e2 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@enhancesoft.com>
Date: Thu, 12 Apr 2018 00:37:23 +0000
Subject: [PATCH] Sort Agents using set Name Format
The commit simply uses existing order by routing in Staff class
---
include/class.search.php | 32 ++------------------------------
1 file changed, 2 insertions(+), 30 deletions(-)
diff --git a/include/class.search.php b/include/class.search.php
index 8c2c54920..8b6ec0059 100644
--- a/include/class.search.php
+++ b/include/class.search.php
@@ -1151,22 +1151,8 @@ class AssigneeChoiceField extends ChoiceField {
}
function applyOrderBy($query, $reverse=false, $name=false) {
- global $cfg;
-
$reverse = $reverse ? '-' : '';
- switch ($cfg->getAgentNameFormat()) {
- case 'last':
- case 'lastfirst':
- case 'legal':
- $query->order_by("{$reverse}staff__lastname",
- "{$reverse}staff__firstname", "{$reverse}team__name");
- break;
- default:
- $query->order_by("{$reverse}staff__firstname",
- "{$reverse}staff__lastname", "{$reverse}team__name");
- }
-
- return $query;
+ return Staff::nsort($query, $reverse);
}
}
@@ -1241,22 +1227,8 @@ class AgentSelectionField extends AdvancedSearchSelectionField {
function applyOrderBy($query, $reverse=false, $name=false) {
- global $cfg;
-
$reverse = $reverse ? '-' : '';
- switch ($cfg->getAgentNameFormat()) {
- case 'last':
- case 'lastfirst':
- case 'legal':
- $query->order_by("{$reverse}staff__lastname",
- "{$reverse}staff__firstname");
- break;
-
- default:
- $query->order_by("{$reverse}staff__firstname",
- "{$reverse}staff__lastname");
- }
- return $query;
+ return Staff::nsort($query, $reverse);
}
}
--
GitLab