diff --git a/extension/lite/effort/ext/config/lite.php b/extension/lite/effort/ext/config/lite.php new file mode 100644 index 0000000000..663a777296 --- /dev/null +++ b/extension/lite/effort/ext/config/lite.php @@ -0,0 +1,5 @@ +effort->list->exportFields = 'id,date,dept,account,work,consumed,left,objectType,execution'; +$config->effort->list->defaultFields = 'id,date,account,work,consumed,left,objectType,execution'; + +$config->effort->datatable->defaultField = array('id', 'date', 'account', 'work', 'consumed', 'left', 'objectType', 'execution'); diff --git a/extension/lite/effort/ext/view/edit.lite.html.hook.php b/extension/lite/effort/ext/view/edit.lite.html.hook.php new file mode 100644 index 0000000000..a6c7e77c5b --- /dev/null +++ b/extension/lite/effort/ext/view/edit.lite.html.hook.php @@ -0,0 +1,6 @@ + diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 4665996e50..9af7f23758 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -202,6 +202,7 @@ $lang->doc->noCollectedDoc = 'You have not favorited any documents.'; $lang->doc->errorEmptyLib = 'No data in document library.'; $lang->doc->confirmUpdateContent = 'You have a document that is not saved from last time. Do you want to continue editing it?'; $lang->doc->selectLibType = 'Please select a type of doc library.'; +$lang->doc->noLibreOffice = 'You does not have access to office conversion settings!'; $lang->doc->noticeAcl['lib']['product']['default'] = 'Users who can access the selected product can access it.'; $lang->doc->noticeAcl['lib']['product']['custom'] = 'Users who can access the selected product or users in the whiltelist can access it.'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index d620c0dcc1..255a1f793f 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -202,6 +202,7 @@ $lang->doc->noCollectedDoc = '您还没有收藏任何文档。'; $lang->doc->errorEmptyLib = '文档库暂无数据。'; $lang->doc->confirmUpdateContent = '检查到您有未保存的文档内容,是否继续编辑?'; $lang->doc->selectLibType = '请选择文档库类型'; +$lang->doc->noLibreOffice = '您还没有office转换设置访问权限!'; $lang->doc->noticeAcl['lib']['product']['default'] = '有所选产品访问权限的用户可以访问。'; $lang->doc->noticeAcl['lib']['product']['custom'] = '有所选产品访问权限或白名单里的用户可以访问。'; diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index 59accb6c47..83f3ec807b 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -29,7 +29,7 @@