diff --git a/include/class.queue.php b/include/class.queue.php index 6397d34d7fa6d3e28e4635da3264ef4676ed704c..e434661d2d8beb58c0751f76619d5202ad3539bc 100644 --- a/include/class.queue.php +++ b/include/class.queue.php @@ -2377,7 +2377,7 @@ extends VerySimpleModel { $reverse = $reverse ? '-' : ''; $query = $query->order_by("{$reverse}{$alias}"); - } else { + } elseif($keys[0]) { list($path, $field) = $keys[0]; $query = $field->applyOrderBy($query, $reverse, $path); } diff --git a/include/class.search.php b/include/class.search.php index 7248c25199776524be97dbae5f297761155cb8ca..2db2766ed9e50b7916380f43bb37e18f962e87aa 100644 --- a/include/class.search.php +++ b/include/class.search.php @@ -1565,6 +1565,11 @@ class TicketStatusChoiceField extends SelectionField { return parent::getSearchQ($method, $value, $name); } } + + function applyOrderBy($query, $reverse=false, $name=false) { + $reverse = $reverse ? '-' : ''; + return $query->order_by("{$reverse}status__name"); + } } class TicketThreadCountField extends NumericField { diff --git a/include/i18n/en_US/queue_column.yaml b/include/i18n/en_US/queue_column.yaml index 03250da19a83b3118bbd04eb4792218c232928dd..87b3c09c13bee6d5b4757ca6329f35a715ff6f28 100644 --- a/include/i18n/en_US/queue_column.yaml +++ b/include/i18n/en_US/queue_column.yaml @@ -69,8 +69,8 @@ conditions: "[]" - id: 6 - name: "Status Name" - primary: "status__name" + name: "Status" + primary: "status__id" truncate: "wrap" annotations: "[]" conditions: "[]"