diff --git a/module/datatable/control.php b/module/datatable/control.php index f365b7e8b1..5f458c0173 100644 --- a/module/datatable/control.php +++ b/module/datatable/control.php @@ -99,12 +99,7 @@ class datatable extends control if($module == 'execution' and $method == 'all') { - if($extra == 'execution' or $extra == 'project') - { - unset($cols['percent']); - unset($cols['attribute']); - unset($cols['actions']); - } + if($extra == 'execution' or $extra == 'project') unset($cols['actions']); if($extra == 'project' or $extra == 'stage') unset($cols['project']); } diff --git a/module/execution/control.php b/module/execution/control.php index 58ee1fae6d..bb72b95d4d 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -3476,16 +3476,6 @@ class execution extends control $parents = array(); if($parentIdList) $parents = $this->execution->getByIdList($parentIdList); - $isStage = (isset($project->model) and $project->model == 'waterfall') ? true : false; - if($isStage) - { - $this->config->execution->datatable->defaultField = array('id', 'name', 'PM', 'status', 'progress', 'percent', 'attribute', 'begin', 'end', 'realBegan', 'realEnd', 'actions'); - } - elseif($this->app->tab == 'project') - { - $this->config->execution->datatable->defaultField = array('id', 'name', 'code', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn'); - } - $this->view->executionStats = $executionStats; $this->view->productList = $this->loadModel('product')->getProductPairsByProject($projectID); $this->view->productID = $productID; @@ -3497,7 +3487,8 @@ class execution extends control $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->view->status = $status; $this->view->from = $from; - $this->view->isStage = $isStage; + $this->view->isStage = (isset($project->model) and $project->model == 'waterfall') ? true : false; + $this->display(); }