MTrack/CommitChecker.php

[web.mtrack] / MTrack / CommitChecker.php

diff --git a/MTrack/CommitChecker.php b/MTrack/CommitChecker.php
index ac8274e..c4f7cda 100644 (file)
--- a/MTrack/CommitChecker.php
+++ b/MTrack/CommitChecker.php
@@ -196,7 +196,8 @@ class MTrack_CommitChecker {
             $c->changelog   = $bridge->getCommitMessage();
             $c->changeby    = $this->authUser->email; //???
             $c->changeby_id = $this->authUser->id; //???
-            $c->ctime       = time();
+             
+            $c->ctime       = isset($bridge->props['Date']) ? strtotime($bridge->props['Date']) : time();
             $c->fileActions = $bridge->fileActions;
             $changes[] = $c;
         }
@@ -264,17 +265,23 @@ class MTrack_CommitChecker {
             }
             
             // apply changes to tickets
+            $T = false;
             foreach ($tickets as $tkt => $act) {
                 // removed all the code that handles hashed ticked ids...
-                
+                //DB_DataObject::DebugLevel(1);
                 $T = DB_DataObject::Factory('mtrack_ticket');
-                
+                $T->project_id = $this->repo->project_id;
                 if (!$T->get($tkt)) {
                     continue;
                 }
+                break;
                 
                 $T_by_tid[$T->id] = $T;
             }
+            
+            if (!$T) {
+                continue;
+            }
             /*
             $accounted = false;
             
@@ -315,6 +322,7 @@ class MTrack_CommitChecker {
                 }
                 */
                 
+            // for the stuff below we do not currently support multiple tickets..
             
             $log .= $c->changelog;
             if (!isset($deferred[$T->id])) {
@@ -322,6 +330,7 @@ class MTrack_CommitChecker {
                     'comments' => array(),
                     'changes' => array(),
                     'act' => array(),
+                    'ticket' => $T
                     
                 );
             }
@@ -329,7 +338,7 @@ class MTrack_CommitChecker {
             
             $deferred[$T->id]['comments'][] = $log;
             $deferred[$T->id]['changes'][] = $c;
-            $deferred[$T->id]['ticket'][] = $T;
+            
             
             
             if (isset($act['spent']) && $c->changeby != $me) {