diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 9aa7e71463..ec03997c6a 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -173,7 +173,7 @@ $lang->project->homeMenu->browse = array('link' => ($config->systemMode == 'new' /* Scrum menu. */ $lang->scrum->menu = new stdclass(); $lang->scrum->menu->index = array('link' => "{$lang->dashboard}|project|index|project=%s"); -$lang->scrum->menu->execution = array('link' => "$lang->executionCommon|project|execution|projectID=%s"); +$lang->scrum->menu->execution = array('link' => "$lang->executionCommon|project|execution|status=all&projectID=%s"); $lang->scrum->menu->story = array('link' => "$lang->SRCommon|projectstory|story|projectID=%s", 'subModule' => 'projectstory', 'alias' => 'story,track'); $lang->scrum->menu->doc = array('link' => "{$lang->doc->common}|doc|objectLibs|type=project&objectID=%s", 'subModule' => 'doc'); $lang->scrum->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug,testreport', 'alias' => 'bug,testtask,testcase,testreport'); diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index f9fee5686d..46971555d6 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -31,13 +31,13 @@
project->common : zget($projects, $projectID);?> - ", '', 'class="text-muted"');?> + createLink($this->app->rawModule, $this->app->rawMethod), "", '', 'class="text-muted"');?>
execution->featureBar['all'] as $key => $label):?> - {$label}", '', "class='btn btn-link' id='{$key}Tab' data-app='$from'");?> + createLink($this->app->rawModule, $this->app->rawMethod, "status=$key&projectID=$projectID&orderBy=$orderBy&productID=$productID"), "{$label}", '', "class='btn btn-link' id='{$key}Tab' data-app='$from'");?>
@@ -55,7 +55,7 @@
' data-ride='table'> - recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> + recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
diff --git a/module/project/control.php b/module/project/control.php index 260f44e6f8..6e49f67ac4 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -651,16 +651,22 @@ class project extends control /** * Execution list. * + * @param string $status * @param int $projectID + * @param string $orderBy + * @param int $productID + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID * @access public * @return void */ - public function execution($projectID = 0) + public function execution($status = 'all', $projectID = 0, $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1) { $uri = $this->app->getURI(true); $this->app->session->set('executionList', $uri, 'project'); - echo $this->fetch('execution', 'all', "status=all&projectID=$projectID"); + echo $this->fetch('execution', 'all', "status=$status&projectID=$projectID&orderBy=$orderBy&productID=$productID&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); } /**