Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* adjust for parseComment.

Browse Source
This commit is contained in:
wangyidong
2020-03-09 17:42:43 +08:00
parent 88ffd189e1
commit 5a3ea1e897
3 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ci/model.php
+1
View File
@@ -37,6 +37,7 @@ class ciModel extends model
->leftJoin(TABLE_JENKINS)->alias('t3')->on('t2.jkHost=t3.id')
->where('t1.status')->ne('success')
->andWhere('t1.status')->ne('fail')
->andWhere('t1.status')->ne('create_fail')
->andWhere('t1.status')->ne('timeout')
->andWhere('t1.createdDate')->gt(date(DT_DATETIME1, strtotime("-1 day")))
->fetchAll();
module/git/model.php
+1 -1
View File
@@ -119,7 +119,7 @@ class gitModel extends model
if($objects)
{
$this->printLog('extract' .
'task:' . join(' ', $objects['tasks']) .
' task:' . join(' ', $objects['tasks']) .
' bug:' . join(',', $objects['bugs']));
$this->repo->saveAction2PMS($objects, $log, $this->repoRoot, $repo->encoding, 'git');
module/repo/model.php
+19 -21
View File
@@ -1166,9 +1166,9 @@ class repoModel extends model
$costReg = "($costs) *(($costMarks)([0-9]+)($costUnit))";
$leftReg = "($lefts) *(($leftMarks)([0-9]+)($leftUnit))";
$startTaskReg = "({$startAction}) *{$taskReg} +$costReg +$leftReg";
$effortTaskReg = "({$effortAction}) *{$taskReg} +$costReg +$leftReg";
$finishTaskReg = "({$finishAction}) *{$taskReg} +$costReg";
$startTaskReg = "({$startAction}) *{$taskReg}.*$costReg.*$leftReg";
$effortTaskReg = "({$effortAction}) *{$taskReg}.*$costReg.*$leftReg";
$finishTaskReg = "({$finishAction}) *{$taskReg}.*$costReg";
$resolveBugReg = "({$resolveAction}) *{$bugReg}";
$reg = array();
@@ -1249,7 +1249,10 @@ class repoModel extends model
}
elseif($taskAction == 'finish')
{
$task = $this->task->getById($taskID);
$this->post->set('finishedDate', date('Y-m-d'));
$this->post->set('currentConsumed', $this->post->consumed);
$this->post->set('consumed', $this->post->consumed + $task->consumed);
$changes = $this->task->finish($taskID);
if($changes)
{
@@ -1258,7 +1261,7 @@ class repoModel extends model
}
}
}
unset($object['tasks'][$taskID]);
unset($objects['tasks'][$taskID]);
}
}
if(isset($actions['bug']))
@@ -1285,7 +1288,7 @@ class repoModel extends model
}
}
}
unset($object['bugs'][$bugID]);
unset($objects['bugs'][$bugID]);
}
}
@@ -1350,15 +1353,9 @@ class repoModel extends model
$this->dao->update(TABLE_ACTION)->data($action)->where('id')->eq($record->id)->exec();
if($changes)
{
$historyID = $this->dao->findByAction($record->id)->from(TABLE_HISTORY)->fetch('id');
if($historyID)
{
$this->dao->update(TABLE_HISTORY)->data($changes)->where('id')->eq($historyID)->exec();
}
else
{
$this->action->logHistory($record->id, array($changes));
}
$historyIdList = $this->dao->findByAction($record->id)->from(TABLE_HISTORY)->fetchPairs('id', 'id');
if($historyIdList) $this->dao->delete()->from(TABLE_HISTORY)->where('id')->in($historyIdList)->exec();
$this->action->logHistory($record->id, $changes);
}
}
else
@@ -1367,7 +1364,7 @@ class repoModel extends model
if($changes)
{
$actionID = $this->dao->lastInsertID();
$this->action->logHistory($actionID, array($changes));
$this->action->logHistory($actionID, $changes);
}
}
}
@@ -1400,14 +1397,15 @@ class repoModel extends model
$diff .= $action == 'M' ? "$diffLink\n" : "\n" ;
}
}
$changes = new stdclass();
$changes->field = $scm == 'svn' ? 'subversion' : 'git';
$changes->old = '';
$changes->new = '';
$changes->diff = trim($diff);
$change = new stdclass();
$change->field = $scm == 'svn' ? 'subversion' : 'git';
$change->old = '';
$change->new = '';
$change->diff = trim($diff);
$changes[] = $change;
$this->server->set('PHP_SELF', $oldSelf);
return (array)$changes;
return $changes;
}
/**