Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

extension/lite/effort/ext/config/lite.php

@@ -0,0 +1,5 @@
+<?php
+$config->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');

extension/lite/effort/ext/view/edit.lite.html.hook.php

@@ -0,0 +1,6 @@
+<script>
+$(function()
+{
+    $('#productBox').addClass("hide");
+});
+</script>

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

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']    = '有所选产品访问权限或白名单里的用户可以访问。';

module/doc/view/create.html.php

@@ -29,7 +29,7 @@
 <script>
 $("a[href^='###']").click(function()
 {
-    alert('<?php echo $lang->doc->accessDenied;?>');
+    alert('<?php echo $lang->doc->noLibreOffice;?>');
 });
 </script>
 </body>