From dc912902bd088339a993265d5b0c67cbee263840 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Mon, 12 Sep 2016 15:41:46 +0800 Subject: [PATCH 1/2] * fix bug #871. --- module/doc/lang/en.php | 3 +++ module/doc/lang/zh-cn.php | 3 +++ 2 files changed, 6 insertions(+) diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index ddabeb847d..1316eb4e3d 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -69,3 +69,6 @@ $lang->doc->errorEmptyProject = "{$lang->projectCommon} is empty, can not creat $lang->doc->placeholder = new stdclass(); $lang->doc->placeholder->url = 'url'; + +$lang->doclib = new stdclass(); +$lang->doclib->name = 'Library Name'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 835c1fa8e4..6acfa6237e 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -69,3 +69,6 @@ $lang->doc->errorEmptyProject = "没有{$lang->projectCommon},无法创建文 $lang->doc->placeholder = new stdclass(); $lang->doc->placeholder->url = '相应的链接地址'; + +$lang->doclib = new stdclass(); +$lang->doclib->name = '文档库名称'; From b33141ff022fa9deaa70927905e36d6f9ff0e8f6 Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Mon, 12 Sep 2016 16:09:20 +0800 Subject: [PATCH 2/2] * fix bug #881. --- module/project/view/taskdata.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/view/taskdata.html.php b/module/project/view/taskdata.html.php index 46e5568601..de801ffbec 100644 --- a/module/project/view/taskdata.html.php +++ b/module/project/view/taskdata.html.php @@ -67,7 +67,7 @@ openedDate, 5, 6);?> - >assignedTo == 'closed' ? 'Closed' : $task->assignedToRealName;?> + >assignedTo == 'closed' ? 'Closed' : $users[$task->assignedTo];?> finishedBy, $task->finishedBy);?> cookie->windowWidth > $this->config->wideSize):?>