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

* Adjust mr commmit date check.

Browse Source
This commit is contained in:
caoyanyi
2024-05-20 15:31:22 +08:00
parent 422478e03f
commit 89b23a4c0d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+2 -2
View File
@@ -327,7 +327,7 @@ class mr extends control
$projectMethod = $host->type == 'gitfox' ? 'apiGetSingleRepo' : 'apiGetSingleProject';
$sourceProject = $this->loadModel($host->type)->$projectMethod($MR->hostID, $MR->sourceProject);
$compile = $this->loadModel('compile')->getById($MR->compileID);
$compile = $this->loadModel('compile')->getByID($MR->compileID);
$this->view->title = $this->lang->mr->view;
$this->view->MR = $MR;
@@ -336,7 +336,7 @@ class mr extends control
$this->view->reviewer = $this->loadModel('user')->getById($MR->assignee);
$this->view->actions = $this->loadModel('action')->getList('mr', $MRID);
$this->view->compile = $compile;
$this->view->hasNewCommit = $this->mrZen->checkNewCommit($host->type, $MR->hostID, (string)$MR->targetProject, $MR->mriid, $compile->createdDate);
$this->view->hasNewCommit = $compile ? $this->mrZen->checkNewCommit($host->type, $MR->hostID, (string)$MR->targetProject, $MR->mriid, $compile->createdDate) : false;
$this->view->sourceProject = $sourceProject;
$this->view->targetProject = $this->{$host->type}->$projectMethod($MR->hostID, $MR->targetProject);
$this->view->sourceBranch = $this->mrZen->getBranchUrl($host, $MR->sourceProject, $MR->sourceBranch);