Merge branch 'master' of github.com:easysoft/zentaopms

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';

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 = '文档库名称';

module/project/view/taskdata.html.php

@@ -67,7 +67,7 @@
         <td><?php echo substr($task->openedDate, 5, 6);?></td>
         <?php endif;?>
 
-        <td <?php echo $class;?>><?php echo $task->assignedTo == 'closed' ? 'Closed' : $task->assignedToRealName;?></td>
+        <td <?php echo $class;?>><?php echo $task->assignedTo == 'closed' ? 'Closed' : $users[$task->assignedTo];?></td>
         <td><?php echo zget($users, $task->finishedBy, $task->finishedBy);?></td>
 
         <?php if($this->cookie->windowWidth > $this->config->wideSize):?>