diff --git a/module/user/control.php b/module/user/control.php index d25811ee23..c77da64bed 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -25,6 +25,7 @@ class user extends control $this->loadModel('company')->setMenu(); $this->loadModel('dept'); $this->loadModel('todo'); + $this->loadModel('execution'); $this->app->loadLang('project'); $this->app->loadModuleConfig($this->moduleName);//Finish task #5118.(Fix bug #2271) } @@ -385,7 +386,7 @@ class user extends control $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->execution; $this->view->position[] = $this->lang->user->execution; $this->view->tabID = 'project'; - $this->view->executions = $this->user->getProjects($account, array('sprint', 'stage'), 'all', $pager); + $this->view->executions = $this->user->getProjects($account, 'execution', 'all', $pager); $this->view->user = $user; $this->view->pager = $pager; diff --git a/module/user/model.php b/module/user/model.php index bff89fe824..ee31789cd9 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1018,7 +1018,7 @@ class userModel extends model * Get projects a user participated. * * @param string $account - * @param string $type + * @param string $type project|execution * @param string $status * @access public * @return array @@ -1049,7 +1049,7 @@ class userModel extends model $hours = array(); $emptyHour = array('totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0, 'waitTasks' => 0, 'assignedToMeTasks' => 0); $searchField = $type == 'project' ? 'project' : 'execution'; - $tasks = $this->dao->select('id, project, project, consumed, `left`, status, assignedTo') + $tasks = $this->dao->select('id, project, execution, consumed, `left`, status, assignedTo') ->from(TABLE_TASK) ->where('parent')->lt(1) ->andWhere($searchField)->in($projectIdList)->fi() diff --git a/module/user/view/execution.html.php b/module/user/view/execution.html.php index ac9013c816..9ebdaaa049 100644 --- a/module/user/view/execution.html.php +++ b/module/user/view/execution.html.php @@ -22,15 +22,15 @@