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

* Modify language item.

Browse Source
This commit is contained in:
tianshujie
2022-03-22 12:35:34 +08:00
parent acd514e738
commit 1004f727ae
3 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+3 -9
View File
@@ -1504,15 +1504,8 @@ class bug extends control
public function resolve($bugID, $extra = '')
{
$bug = $this->bug->getById($bugID);
if($bug->execution)
{
$execution = $this->loadModel('execution')->getByID($bug->execution);
if($execution->type == 'kanban' and $this->app->tab == 'execution')
{
$this->app->loadLang('build');
$this->lang->build->execution = str_replace($this->lang->executionCommon, $this->lang->execution->kanban, $this->lang->build->execution);
}
}
if($bug->execution) $execution = $this->loadModel('execution')->getByID($bug->execution);
if(!empty($_POST))
{
$changes = $this->bug->resolve($bugID, $extra);
@@ -1584,6 +1577,7 @@ class bug extends control
$this->view->executions = $this->loadModel('product')->getExecutionPairsByProduct($productID, $bug->branch ? "0,{$bug->branch}" : 0, 'id_desc', $projectID);
$this->view->builds = $this->loadModel('build')->getBuildPairs($productID, $bug->branch, 'withbranch');
$this->view->actions = $this->action->getList('bug', $bugID);
$this->view->execution = isset($execution) ? $execution : '';
$this->display();
}