Merge branch feature/search of zentao/zentaopms (#10994)
This commit is contained in:
@@ -442,12 +442,8 @@ class programplanZen extends programplan
|
||||
if($hasSearch)
|
||||
{
|
||||
/* Build the search form. */
|
||||
$this->config->execution->search['module'] = 'projectTask';
|
||||
|
||||
$actionURL = $this->createLink('programplan', 'browse', "projectID=$projectID&productID=$productID&type=$type&orderBy=$orderBy&baselineID=$baselineID&browseType=bysearch&queryID=myQueryID");
|
||||
unset($this->config->execution->search['fields']['project']);
|
||||
$executions = $this->programplan->getPairs($projectID, $productID, 'all');
|
||||
$this->loadModel('execution')->buildTaskSearchForm($projectID, $executions, $queryID, $actionURL);
|
||||
$this->loadModel('execution')->buildTaskSearchForm($projectID, $productID, $executions, $queryID, $actionURL, 'programplanTask');
|
||||
}
|
||||
|
||||
$this->view->title = $this->lang->programplan->browse;
|
||||
|
||||
Reference in New Issue
Block a user