Changed DataObjects/Mtrack_ticket.php

diff --git a/DataObjects/Mtrack_ticket.php b/DataObjects/Mtrack_ticket.php
index a1a46c0..e3f9173 100644 (file)
--- a/DataObjects/Mtrack_ticket.php
+++ b/DataObjects/Mtrack_ticket.php
@@ -370,6 +370,7 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
             switch($t->status_name) {
                 
                 case 'new':
+                case 'NEW':
                     // do not show closed..
                     $et->whereAdd("
                         ( CONCAT(etype , '.', name) != 'ticketstate.closed')
@@ -379,7 +380,7 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                     break;
                   
                 case 'closed':
-                    // 
+                case 'CANCELLED':
                     $et->whereAdd("
                                     ( CONCAT(etype , '.', name) = 'ticketstate.reopened')
                                     OR
@@ -388,6 +389,7 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                     break;
                 
                 case 'reopened':
+                
                     $et->whereAdd("
                              ( CONCAT(etype , '.', name) != 'ticketstate.closed')
                              AND
@@ -398,6 +400,8 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
                     break;
 
                 case 'open':
+                case 'OPEN':
+                    
                 default:
                     $et->whereAdd("
                            ( CONCAT(etype , '.', name) != 'ticketstate.closed')
@@ -515,10 +519,12 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
     function isOpen()
     {
         switch ($this->status) {
-          case 'closed':
-            return false;
+            case 'closed':
+            case 'CLOSED':
+                return false;
+            
           default:
-            return true;
+                return true;
         }
     }
     function descriptionToHtml() /* depreciated */
@@ -688,7 +694,7 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
         // used by gitlive close ticket...
         if (!empty($req['status_name']) && empty($req['status'])) {
             $n = DB_DataObject::Factory('core_enum');
-            $n->name = $req['status_name'];
+            $n->whereAddIn('name', array( $req['status_name'], strtoupper($req['status_name'])));
             $n->whereAddIn('etype', array('ticketstate','resolution'),'string');
             if (!$n->find(true)) {
                 $roo->jerr("invalid status name");