Skip to content
Snippets Groups Projects
Commit 3d2f28fd authored by Peter Rotich's avatar Peter Rotich
Browse files

Sort Agents using set Name Format

The commit simply uses existing order by routing in Staff class
parent e399fbae
Branches
Tags
No related merge requests found
......@@ -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);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment