DataObjects/Mtrack_ticket.php

diff --git a/DataObjects/Mtrack_ticket.php b/DataObjects/Mtrack_ticket.php
index 59fd718..2895cfd 100644 (file)
--- a/DataObjects/Mtrack_ticket.php
+++ b/DataObjects/Mtrack_ticket.php
@@ -219,7 +219,7 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
             switch ($q['query']['viewtype']) {
                 case 'active':
                     // hide "on hold" and closed..
-                    $this->whereAdd("join_status_id.name NOT IN('closed', 'on hold') OR  {$tn}.status  = 0");
+                    $this->whereAdd("join_status_id.name NOT IN('closed', 'on hold', 'CLOSED') OR  {$tn}.status  = 0");
                     $this->whereAdd("{$tn}.milestone_id = 0 OR join_milestone_id_id.on_hold = 0");
                     break;
                 
@@ -234,7 +234,7 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                     
                 case 'me':
                 case 'me-all':
-                    $this->whereAdd("join_status_id.name != 'closed' OR  {$tn}.status  = 0 ");
+                    $this->whereAdd("join_status_id.name NOT IN('closed', 'CLOSED') OR  {$tn}.status  = 0 ");
                     $this->whereAdd("mtrack_ticket.developer_id = {$au->id} ");
                     
                     break;
@@ -247,9 +247,9 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                  
                 case 'active-or-recent':
                     $this->whereAdd("
-                            (join_status_id.name != 'closed' OR  {$tn}.status  = 0)
+                            (join_status_id.name  NOT IN('closed', 'CLOSED')  OR  {$tn}.status  = 0)
                             OR
-                            (join_status_id.name = 'closed' AND join_updated.changedate > NOW() - 1 MONTH  )
+                            (join_status_id.name    IN('closed', 'CLOSED')  AND join_updated.changedate > NOW() - 1 MONTH  )
                             ");
                     $this->whereAdd("{$tn}.milestone_id = 0 OR join_milestone_id_id.on_hold = 0");
                     break;
@@ -398,6 +398,8 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                              ( CONCAT(etype , '.', name) != 'ticketstate.closed')
                              AND
                             ( CONCAT(etype , '.', name) != 'ticketstate.new')
+                            AND
+                             ( CONCAT(etype , '.', name) != 'ticketstate.NEW')
                              AND
                            ( CONCAT(etype , '.', name) != 'ticketstate.open')
                             ");
@@ -894,7 +896,7 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
         $t->autoJoin();
         $t->selectAdd();
         // we still apply to closed tickets????
-         $t->whereAdd("join_status_id.name != 'closed'");
+         $t->whereAddIn('join_status_id.name', array( 'closed', 'CLOSED'));
         $t->applySort(false,  'old_style', false);
         
         $old_seqid = $this->seqid;