diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 87393f3b25..0948e1483a 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -34,7 +34,7 @@ js::set('bugBrowseType', $this->session->bugBrowseType);
customMenu['featurebar'] as $type => $featurebar):?>
-
createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=unclosed¶m=0"), $featurebar['link'])?>
+ createLink('bug', 'browse', "productid=$productID&branch=$branch&browseType=$type¶m=0"), $featurebar['link'])?>
bug->byQuery;?>
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 3d5887d3c2..1ba9e345ec 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -38,6 +38,7 @@ $lang->project->totalConsumed = 'Done';
$lang->project->totalLeft = 'Left';
$lang->project->Left = 'Left';
$lang->project->progess = 'Progess';
+$lang->project->hours = 'Estimate %s Consumed %s Left %s';
$lang->project->viewBug = 'View bug';
$lang->project->noProduct = "No {$lang->productCommon}";
$lang->project->createStory = "Create story";
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 48e5ee74f7..c45c66fde4 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -38,6 +38,7 @@ $lang->project->totalConsumed = '总消耗';
$lang->project->totalLeft = '总剩余';
$lang->project->Left = '剩余';
$lang->project->progess = '进度';
+$lang->project->hours = '预计 %s 消耗 %s 剩余 %s';
$lang->project->viewBug = '查看bug';
$lang->project->noProduct = "无{$lang->productCommon}{$lang->projectCommon}";
$lang->project->createStory = "新增需求";
diff --git a/module/project/model.php b/module/project/model.php
index b917f90f63..1bb446d317 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1952,6 +1952,9 @@ class projectModel extends model
$this->loadModel('story');
$this->loadModel('task');
+ static $users;
+ if(empty($users)) $users = $this->loadModel('user')->getPairs('noletter');
+
if($node->children)
{
foreach ($node->children as $child)
@@ -1995,6 +1998,10 @@ class projectModel extends model
$taskItem->color = $task->color;
$taskItem->pri = $task->pri;
$taskItem->status = $task->status;
+ $taskItem->estimate = $task->estimate;
+ $taskItem->consumed = $task->consumed;
+ $taskItem->left = $task->left;
+ $taskItem->assignedTo = $users[$task->assignedTo];
$taskItem->url = helper::createLink('task', 'view', "task=$task->id");
$taskItem->storyChanged = $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion;
diff --git a/module/project/view/tree.html.php b/module/project/view/tree.html.php
index c23e26c2fc..7780f76984 100644
--- a/module/project/view/tree.html.php
+++ b/module/project/view/tree.html.php
@@ -43,8 +43,10 @@ $('#treeTab').addClass('active');
$(function()
{
+ var hoursFormat = 'project->hours ?>';
var viewLevel = '' || 'custom';
var data = $.parseJSON('');
+ console.log('data', data);
var $tree = $('#projectTree');
var statusMap = $.parseJSON('task->statusList);?>');
var selectCustomLevel = function() {$('.tree-view-btn.active').removeClass('active').filter('[data-type="custom"]').addClass('active');};
@@ -98,7 +100,8 @@ $(function()
$tr.append($(' | ').append('' + task.pri + ''));
$tr.append($(' | ').addClass('text-left').append($('').attr({href: task.url}).text('#' + task.id + ' ' + task.title).css('color', task.color)));
$tr.append($(' | ').addClass(task.storyChanged ? 'warning' : task.status).text(statusMap[task.status]));
- $tr.append($(' | ').addClass(task.storyChanged ? 'warning' : task.status).text(statusMap[task.status]));
+ $tr.append($(' | ').html(task.assignedTo ? (' ' + task.assignedTo) : ''));
+ $tr.append($(' | ').text(hoursFormat.replace('%s', task.estimate).replace('%s', task.consumed).replace('%s', task.left)));
$tr.append($(' | ').html(task.buttons));
$tbody.append($tr);
});