Partial Fix #5641 - MTrack - show diffs in emails and ticket view
authorAlan Knowles <alan@roojs.com>
Mon, 31 Dec 2018 04:06:55 +0000 (12:06 +0800)
committerAlan Knowles <alan@roojs.com>
Mon, 31 Dec 2018 04:06:55 +0000 (12:06 +0800)
DataObjects/Mtrack_change.php
DataObjects/Mtrack_change_audit.php

index 4d16581..a4a4bc8 100644 (file)
@@ -557,6 +557,29 @@ class Pman_MTrack_DataObjects_Mtrack_change extends DB_DataObject
         }
         return $ret;
         
+    }
+    
+    function relatedCommit()
+    {
+        if (empty($this->rev))  {
+            return '';
+        }
+        // occurs on a ticket... when listing...
+        $mc = DB_DataObject::Factory('mtrack_change');
+        $mc->rev = $this->rev;
+        $mc->ontable = 'mtrack_repos';
+        if (!$mc->find(true)) {
+            return '';
+        }
+        // got the repo.. and the commit..
+        
+        $repo = $mc->objectCached();
+         
+        $res = $repo->impl()->history('.', 1, 'rev', $this->rev);
+        return $res;
+        
+        
+        
     }
     
     
@@ -609,6 +632,8 @@ class Pman_MTrack_DataObjects_Mtrack_change extends DB_DataObject
     {
         $ret = $this->toArray();
         $ret['audit'] = $this->cachedAuditToJSONArray();
+        $ret['commit']  = $this->relatedCommits();
+         
         return $ret;
         
     }
index af381d3..f432813 100644 (file)
@@ -150,6 +150,10 @@ class Pman_MTrack_DataObjects_Mtrack_change_audit extends DB_DataObject
         if ($this->value == $this->oldvalue) {
             return false;
         }
+        
+        
+        
+        
         return $ret;
         
     }