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

* Fix bug when link bug to revision.

Browse Source
This commit is contained in:
liyuchun
2022-10-24 17:17:30 +08:00
parent 06da2b4e8a
commit 539c7a776f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+2 -2
View File
@@ -453,8 +453,8 @@ class mr extends control
$this->view->arrange = $arrange;
$this->view->sourceBranch = $MR->sourceBranch;
$this->view->targetBranch = $MR->targetBranch;
$this->view->newRevision = $MR->targetBranch;
$this->view->oldRevision = $MR->sourceBranch;
$this->view->oldRevision = $MR->targetBranch;
$this->view->newRevision = $MR->sourceBranch;
$this->display();
}
module/repo/control.php
+1 -1
View File
@@ -1195,7 +1195,7 @@ class repo extends control
else
{
$this->config->bug->search['fields']['branch'] = $this->lang->product->branch;
$this->config->bug->search['params']['branch']['values'] = array('' => '') + $this->loadModel('branch')->getPairs($productID, 'noempty');
$this->config->bug->search['params']['branch']['values'] = array('' => '') + $this->loadModel('branch')->getPairs($product->id, 'noempty');
}
session_start();
$this->loadModel('search')->setSearchParams($this->config->bug->search);