Fix #7734 - add ticket to branches

diff --git a/DataObjects/Mtrack_change.php b/DataObjects/Mtrack_change.php
index 3c9d76f..6a6e95c 100644 (file)
--- a/DataObjects/Mtrack_change.php
+++ b/DataObjects/Mtrack_change.php
@@ -764,7 +764,7 @@ class Pman_MTrack_DataObjects_Mtrack_change extends DB_DataObject
         }
         
         $res = $tg->factory('SendMessage',array(
-            'chat_id' => 35721679, 
+            'chat_id' => 35721679,   // fixme - this needs to be mapped to who we are sending to (currently it's only me!!!)
             'parse_mode' => 'MarkdownV2',
             'text' => "/ticket@{$this->onid}  *". $tg->escape($t->summary) . "*\n\n".
                     "{$this->cgtype} by ". $tg->escape($this->person()->name) . "\n\n" . $tg->escape(implode("\n", $str))

diff --git a/DataObjects/Mtrack_repos.php b/DataObjects/Mtrack_repos.php
index daa5a8f..6304787 100644 (file)
--- a/DataObjects/Mtrack_repos.php
+++ b/DataObjects/Mtrack_repos.php
@@ -453,6 +453,10 @@ class Pman_MTrack_DataObjects_Mtrack_repos extends DB_DataObject
         if ($b->find(true)) {
             return $b;
         }
+        if (preg_match("/_T([0-9]+)_/",$n, $matches)) {
+            $b->ticket_id = $matches[1];
+        }
+        
         $b->insert();
         return $b;
     }

diff --git a/sql/mtrack_repos_branch.sql b/sql/mtrack_repos_branch.sql
index b85ef62..7cbc74b 100644 (file)
--- a/sql/mtrack_repos_branch.sql
+++ b/sql/mtrack_repos_branch.sql
@@ -4,6 +4,9 @@ CREATE TABLE mtrack_repos_branch (
   repo_id INT(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (id)
 ) ;
+
+ ALTER TABLE mtrack_repos_branch ADD COLUMN ticket_id INT  NOT NULL DEFAULT 0;
+
 ALTER TABLE mtrack_repos_branch ADD INDEX plookup(repo_id,name);
 
  ALTER TABLE mtrack_repos_branch CHANGE COLUMN name name  VARCHAR(128) NOT NULL DEFAULT '';