diff --git a/module/execution/control.php b/module/execution/control.php index 34d806dbc3..394b885125 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -197,7 +197,7 @@ class execution extends control /* Build the search form. */ $modules = $this->loadModel('tree')->getTaskOptionMenu($executionID, 0, $showModule); $actionURL = $this->createLink('execution', 'task', "executionID=$executionID&status=bySearch¶m=myQueryID&orderBy=$orderBy&recTotal=0&recPerPage=100&pageID=1&from=$from&blockID=$blockID"); - $this->execution->buildTaskSearchForm($executionID, $productID, $this->executions, $queryID, $actionURL); + $this->execution->buildTaskSearchForm($executionID, $this->executions, $queryID, $actionURL); $this->view->title = $execution->name . $this->lang->hyphen . $this->lang->execution->task; $this->view->tasks = $tasks; diff --git a/module/execution/model.php b/module/execution/model.php index 4487d55308..89fc7c4741 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -4169,7 +4169,6 @@ class executionModel extends model * Build task search form. * * @param int $executionID - * @param int $productID * @param array $executions * @param int $queryID * @param string $actionURL @@ -4177,7 +4176,7 @@ class executionModel extends model * @access public * @return void */ - public function buildTaskSearchForm(int $executionID, int $productID, array $executions, int $queryID, string $actionURL, string $module = 'task', bool $cacheSearchFunc = true) + public function buildTaskSearchForm(int $executionID, array $executions, int $queryID, string $actionURL, string $module = 'task', bool $cacheSearchFunc = true) { $searchConfig = $this->config->execution->search; if($cacheSearchFunc) diff --git a/module/programplan/zen.php b/module/programplan/zen.php index d4d92a7454..87c9562aaa 100644 --- a/module/programplan/zen.php +++ b/module/programplan/zen.php @@ -444,7 +444,7 @@ class programplanZen extends programplan /* Build the search form. */ $actionURL = $this->createLink('programplan', 'browse', "projectID=$projectID&productID=$productID&type=$type&orderBy=$orderBy&baselineID=$baselineID&browseType=bysearch&queryID=myQueryID"); $executions = $this->programplan->getPairs($projectID, $productID, 'all'); - $this->loadModel('execution')->buildTaskSearchForm($projectID, $productID, $executions, $queryID, $actionURL, 'projectTask'); + $this->loadModel('execution')->buildTaskSearchForm($projectID, $executions, $queryID, $actionURL, 'projectTask'); } $this->view->title = $this->lang->programplan->browse; diff --git a/module/project/control.php b/module/project/control.php index 2018a1fa75..68a8780ad5 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -880,7 +880,7 @@ class project extends control $actionURL = $this->createLink('project', 'execution', "status=bysearch&projectID=$projectID&orderBy=$orderBy&productID=$productID&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID&queryID=myQueryID"); $executions = $this->execution->fetchExecutionList($projectID, 'all', $productID); $executions = $this->execution->getPairsByList(array_keys($executions)); - $this->execution->buildTaskSearchForm($projectID, $productID, $executions, $queryID, $actionURL, 'projectTask'); + $this->execution->buildTaskSearchForm($projectID, $executions, $queryID, $actionURL, 'projectTask'); } $this->view->title = $this->lang->execution->allExecutions;