DataObjects/Mtrack_ticket.php

diff --git a/DataObjects/Mtrack_ticket.php b/DataObjects/Mtrack_ticket.php
index a97f362..ab85075 100644 (file)
--- a/DataObjects/Mtrack_ticket.php
+++ b/DataObjects/Mtrack_ticket.php
@@ -424,6 +424,11 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
             
             case 'milestone_id':
                    $this->orderBy("
+                        case
+                            when join_status_id.display_name = 'in progress' then 1
+                            when join_status_id.display_name = 'resolved' then -1
+                            else 0
+                        end DESC,
                        (case when join_milestone_id_id.duedate is null then 1 else 0 end) ASC,
                             join_milestone_id_id.duedate $direction ,
                               {$tn}.seqid $direction ,
@@ -443,7 +448,14 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                        ');
                 return;
             case 'priority_id':
-                $this->orderBy(" join_priority_id_id.seqid $direction, {$tn}.seqid ASC   ");
+                $this->orderBy("
+                        case
+                            when join_status_id.display_name = 'in progress' then 1
+                            when join_status_id.display_name = 'resolved' then -1
+                            else 0
+                        end DESC,
+                        join_priority_id_id.seqid $direction, {$tn}.seqid ASC
+                    ");
                 break;
             default:
                 // this should favour in_progress, and disfavour resolved