DataObjects/Mtrack_ticket.php

diff --git a/DataObjects/Mtrack_ticket.php b/DataObjects/Mtrack_ticket.php
index 869d1d7..d92c444 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', 'CLOSED') OR  {$tn}.status  = 0");
+                    $this->whereAdd("join_status_id.name NOT IN(  'CLOSED') OR  {$tn}.status  = 0");
                     $this->whereAdd("{$tn}.milestone_id = 0 OR join_milestone_id_id.on_hold = 0");
                     break;
                 
@@ -710,6 +710,10 @@ class Pman_MTrack_DataObjects_Mtrack_ticket extends DB_DataObject
         }
         // used by gitlive close ticket...
         if (!empty($req['status_name']) && empty($req['status'])) {
+            if ($req['status_name'] == 'resolved') {
+                $req['status_name']  = 'REVIEW_BY_ADMIN';
+                // if it's an admin doing it.. then set it to fixed?
+            }
             $n = DB_DataObject::Factory('core_enum');
             $n->whereAddIn('name', array( $req['status_name'], strtoupper($req['status_name'])), 'string');
             $n->whereAddIn('etype', array('ticketstate','resolution'),'string');