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

* Fix bug #35084.

Browse Source
This commit is contained in:
Yagami
2023-05-14 11:57:36 +08:00
parent 8be01f41a0
commit 0f1fdb8a82
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+11 -6
View File
@@ -2731,10 +2731,7 @@ class executionModel extends model
}
/* Build search form. */
if($type == 'executionStory')
{
$this->config->product->search['module'] = 'executionStory';
}
if($type == 'executionStory') $this->config->product->search['module'] = 'executionStory';
$this->config->product->search['fields']['title'] = str_replace($this->lang->SRCommon, $this->lang->SRCommon, $this->lang->story->title);
$this->config->product->search['actionURL'] = $actionURL;
@@ -2762,8 +2759,6 @@ class executionModel extends model
$this->config->product->search['params']['branch']['values'] = array('' => '') + $branchPairs;
}
if($storyType == 'requirement') unset($this->config->product->search['fields']['plan']);
$this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $this->lang->story->statusList);
$project = $execution;
@@ -2775,6 +2770,16 @@ class executionModel extends model
if($project->model != 'kanban') unset($this->config->product->search['fields']['plan']);
}
if($storyType == 'requirement')
{
unset($this->config->product->search['fields']['plan']);
if($project->model == 'ipd')
{
unset($this->config->product->search['fields']['stage']);
unset($this->config->product->search['fields']['status']);
}
}
$this->loadModel('search')->setSearchParams($this->config->product->search);
}