diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 3d6867da81..ced9d1739e 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -113,6 +113,21 @@ $lang->doc->browseTypeList['menu'] = 'Menu';
$lang->doc->browseTypeList['tree'] = 'Tree';
$lang->doc->browseTypeList['card'] = 'Card';
+$lang->doc->orderByOpen = 'Recently Added';
+
+$lang->doc->fastMenuList['byediteddate'] = 'Recently Modified';
+//$lang->doc->fastMenuList['visiteddate'] = 'Recently Visited';
+$lang->doc->fastMenuList['openedbyme'] = 'My Doc';
+$lang->doc->fastMenuList['collectedbyme'] = 'My collection';
+
+$lang->doc->fastMenuIconList['byediteddate'] = 'icon-folder-upload';
+//$lang->doc->fastMenuIconList['visiteddate'] = 'icon-folder-move';
+$lang->doc->fastMenuIconList['openedbyme'] = 'icon-folder-account';
+$lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star';
+
+$lang->doc->customObjectLibs['files'] = 'Display File Library';
+$lang->doc->customObjectLibs['customFiles'] = 'Display Custom Library';
+
$lang->doc->confirmDelete = "Do you want to delete this document?";
$lang->doc->confirmDeleteLib = "Do you want to delete this Doc Lib?";
$lang->doc->errorEditSystemDoc = "System Doc Lib needs no modifications.";
diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php
index ca3c88c850..d0dc5f757c 100644
--- a/module/doc/lang/zh-cn.php
+++ b/module/doc/lang/zh-cn.php
@@ -130,8 +130,8 @@ $lang->doc->fastMenuIconList['byediteddate'] = 'icon-folder-upload';
$lang->doc->fastMenuIconList['openedbyme'] = 'icon-folder-account';
$lang->doc->fastMenuIconList['collectedbyme'] = 'icon-folder-star';
-$lang->doc->customObjectLibs['files'] = '是否显示附件库';
-$lang->doc->customObjectLibs['customFiles'] = '是否显示自定义文件';
+$lang->doc->customObjectLibs['files'] = '显示附件库';
+$lang->doc->customObjectLibs['customFiles'] = '显示自定义文件';
$lang->doc->confirmDelete = "您确定删除该文档吗?";
$lang->doc->confirmDeleteLib = "您确定删除该文档库吗?";
diff --git a/module/doc/view/alllibs.html.php b/module/doc/view/alllibs.html.php
index 91cee37d85..d210d10c89 100644
--- a/module/doc/view/alllibs.html.php
+++ b/module/doc/view/alllibs.html.php
@@ -11,7 +11,7 @@
*/
?>
-
+
from == 'doc'):?>
@@ -47,6 +47,7 @@
id&objectType=lib", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
id", "", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
id", "", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
+ id&type=doc", "", '', "title='{$lang->tree->manage}' class='btn btn-link'")?>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 5cdeabd7a3..fb5ed5b2f9 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -19,7 +19,7 @@ var browseType = '';
from != 'doc') js::set('type', 'doc');?>
-
+
from == 'doc'):?>
@@ -65,6 +65,7 @@ var browseType = '';
id&orderBy=$orderBy&from=$from"), " " . $module->name);?> |
id&objectType=module", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
+ ", '', "title='{$lang->tree->manage}' class='btn btn-link'")?>
|
|
|
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index 3674ac09e4..8c7eb0f4ca 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -21,6 +21,7 @@
id}&objectType=module", "", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'");?>
+ ", '', "title='{$lang->tree->manage}' class='btn btn-link'")?>
diff --git a/module/doc/view/objectlibs.html.php b/module/doc/view/objectlibs.html.php
index 20cac33c9b..a0feab3acf 100644
--- a/module/doc/view/objectlibs.html.php
+++ b/module/doc/view/objectlibs.html.php
@@ -11,7 +11,7 @@
*/
?>
-
+
from == 'doc'):?>
@@ -72,6 +72,7 @@
", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
+ ", '', "title='{$lang->tree->manage}' class='btn btn-link'")?>
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index 134f584366..89141c518a 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -11,9 +11,11 @@
*/
?>
-
+
+ from == 'doc'):?>
+
diff --git a/module/project/model.php b/module/project/model.php
index 8c8754ae6b..1e731bcadc 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2668,7 +2668,7 @@ class projectModel extends model
$taskItem->consumed = $task->consumed;
$taskItem->left = $task->left;
$taskItem->openedBy = $users[$task->openedBy];
- $taskItem->assignedTo = $users[$task->assignedTo];
+ $taskItem->assignedTo = zget($users, $task->assignedTo);
$taskItem->url = helper::createLink('task', 'view', "task=$task->id");
$taskItem->storyChanged = $story and $story->status == 'active' and $story->version > $story->taskVersion;