diff --git a/module/project/control.php b/module/project/control.php index 0e36ee9592..c91b92a5c2 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -132,6 +132,7 @@ class project extends control $this->view->orderBy = $orderBy; $this->view->browseType = strtolower($status); $this->view->status = $status; + $this->view->users = $this->loadModel('user')->getPairs('noletter'); $this->display(); } @@ -164,6 +165,9 @@ class project extends control $taskLang = $this->lang->task; $groupByList = array(); $groupTasks = array(); + + /* Get users. */ + $users = $this->loadModel('user')->getPairs('noletter'); foreach($tasks as $task) { if($groupBy == 'story') @@ -179,6 +183,18 @@ class project extends control { $groupTasks[$task->assignedToRealName][] = $task; } + elseif($groupBy == 'openedby') + { + $groupTasks[$users[$task->openedBy]][] = $task; + } + elseif($groupBy == 'finishedby') + { + $groupTasks[$users[$task->finishedBy]][] = $task; + } + elseif($groupBy == 'closedby') + { + $groupTasks[$users[$task->closedBy]][] = $task; + } elseif($groupBy == 'type') { $groupTasks[$taskLang->typeList[$task->type]][] = $task; @@ -195,6 +211,7 @@ class project extends control $this->view->groupByList = $groupByList; $this->view->browseType = 'group'; $this->view->groupBy = $groupBy; + $this->view->users = $users; $this->display(); } diff --git a/module/project/lang/en.php b/module/project/lang/en.php index 09a1e61a8b..bf021d6421 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -92,7 +92,11 @@ $lang->project->delayed = 'Delayed'; $lang->project->groups['story'] = 'Group by story'; $lang->project->groups['status'] = 'Group by status'; $lang->project->groups['pri'] = 'Group by priority'; +$lang->project->groups['openedby'] = 'Group by openedBy'; $lang->project->groups['assignedTo']= 'Group by assignedTo'; +$lang->project->groups['finishedby']= 'Group by finishedBy'; +$lang->project->groups['closedby'] = 'Group by closedBy'; + $lang->project->groups['estimate'] = 'Group by estimate'; $lang->project->groups['consumed'] = 'Group by consumed'; $lang->project->groups['left'] = 'Group by left'; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 456ba33232..fe7434ba77 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -92,7 +92,10 @@ $lang->project->delayed = '已延期'; $lang->project->groups['story'] = '需求分组'; $lang->project->groups['status'] = '状态分组'; $lang->project->groups['pri'] = '优先级分组'; +$lang->project->groups['openedby'] = '创建者分组'; $lang->project->groups['assignedTo']= '指派给分组'; +$lang->project->groups['finishedby']= '完成者分组'; +$lang->project->groups['closedby'] = '关闭者分组'; $lang->project->groups['estimate'] = '预计分组'; $lang->project->groups['consumed'] = '已消耗分组'; $lang->project->groups['left'] = '剩余分组'; diff --git a/module/project/view/grouptask.html.php b/module/project/view/grouptask.html.php index 44676144b1..a2d07f1b2e 100644 --- a/module/project/view/grouptask.html.php +++ b/module/project/view/grouptask.html.php @@ -20,6 +20,7 @@