From 5c548c7a7de37390694b84c75a0e4625e3cb52fd Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Mon, 24 Oct 2016 23:23:08 +0000
Subject: [PATCH] Agent Sorting
Account for agents' name format setting when sorting agents.
---
include/staff/staffmembers.inc.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php
index 7ddba38ea..97f7c1265 100644
--- a/include/staff/staffmembers.inc.php
+++ b/include/staff/staffmembers.inc.php
@@ -16,12 +16,6 @@ $sortOptions = array(
$orderWays = array('DESC'=>'DESC', 'ASC'=>'ASC');
$sort = ($_REQUEST['sort'] && $sortOptions[strtolower($_REQUEST['sort'])]) ? strtolower($_REQUEST['sort']) : 'name';
-if ($sort && $sortOptions[$sort]) {
- $order_column = $sortOptions[$sort];
-}
-
-$order_column = $order_column ? $order_column : array('firstname', 'lastname');
-
switch ($cfg->getAgentNameFormat()) {
case 'last':
case 'lastfirst':
@@ -31,6 +25,12 @@ case 'legal':
// Otherwise leave unchanged
}
+if ($sort && $sortOptions[$sort]) {
+ $order_column = $sortOptions[$sort];
+}
+
+$order_column = $order_column ?: array('firstname', 'lastname');
+
if ($_REQUEST['order'] && isset($orderWays[strtoupper($_REQUEST['order'])])) {
$order = $orderWays[strtoupper($_REQUEST['order'])];
} else {
--
GitLab