diff --git a/module/doc/control.php b/module/doc/control.php index 93cefafd63..c5d0e6068e 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -2265,11 +2265,32 @@ class doc extends control * 报告模板列表。 * Report template list. * + * @param int $libID + * @param string $type + * @param int $docID + * @param string $orderBy + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID + * @param string $mode home|list * @access public * @return void */ - public function browseReportTemplate() + public function browseReportTemplate(int $libID = 0, string $type = 'all', int $docID = 0, string $orderBy = 'id_desc', int $recTotal = 0, int $recPerPage = 20, int $pageID = 1, string $mode = 'home') { + $this->app->loadClass('pager', true); + $pager = new pager($recTotal, $recPerPage, $pageID); + $templateList = array(); + + $this->view->title = $this->lang->doc->template; + $this->view->libID = $libID; + $this->view->users = $this->loadModel('user')->getPairs('noclosed,noletter'); + $this->view->templateList = $templateList; + $this->view->docID = $docID; + $this->view->orderBy = $orderBy; + $this->view->recPerPage = $recPerPage; + $this->view->pageID = $pageID; + $this->view->mode = $mode; $this->display(); } } diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index 09435c2a6f..5d04b3c27f 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -106,6 +106,8 @@ $lang->docTemplate->editedList = 'Template editor'; $lang->docTemplate->content = 'Template Text'; $lang->docTemplate->templateDesc = 'Template Desc'; $lang->docTemplate->status = 'Template Status'; +$lang->docTemplate->noReportTemplate = 'No Report Template'; +$lang->docTemplate->createReportTemplate = 'Create Report Template'; $lang->docTemplate->create = 'Create Template'; $lang->docTemplate->edit = 'Edit Template'; @@ -315,6 +317,7 @@ $lang->doc->moveTo = 'Move to'; $lang->doc->notSupportExport = 'This document does not support export'; $lang->doc->browseReportTemplate = 'Report Template Home'; $lang->doc->browseReport = 'Report Home'; +$lang->doc->createReportTemplate = 'Create Report Template'; $lang->doc->preview = 'Preview'; $lang->doc->insertTitle = 'Insert %s list'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 34e8c25102..4a390951fa 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -106,6 +106,8 @@ $lang->docTemplate->editedList = 'Template editor'; $lang->docTemplate->content = 'Template Text'; $lang->docTemplate->templateDesc = 'Template Desc'; $lang->docTemplate->status = 'Template Status'; +$lang->docTemplate->noReportTemplate = 'No Report Template'; +$lang->docTemplate->createReportTemplate = 'Create Report Template'; $lang->docTemplate->create = 'Create Template'; $lang->docTemplate->edit = 'Edit Template'; @@ -315,6 +317,7 @@ $lang->doc->moveTo = 'Move to'; $lang->doc->notSupportExport = 'This document does not support export'; $lang->doc->browseReportTemplate = 'Report Template Home'; $lang->doc->browseReport = 'Report Home'; +$lang->doc->createReportTemplate = 'Create Report Template'; $lang->doc->preview = 'Preview'; $lang->doc->insertTitle = 'Insert %s list'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index d260b40912..9e9e17b3ee 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -106,6 +106,8 @@ $lang->docTemplate->editedList = 'Template editor'; $lang->docTemplate->content = 'Template Text'; $lang->docTemplate->templateDesc = 'Template Desc'; $lang->docTemplate->status = 'Template Status'; +$lang->docTemplate->noReportTemplate = 'No Report Template'; +$lang->docTemplate->createReportTemplate = 'Create Report Template'; $lang->docTemplate->create = 'Create Template'; $lang->docTemplate->edit = 'Edit Template'; @@ -315,6 +317,7 @@ $lang->doc->moveTo = 'Move to'; $lang->doc->notSupportExport = 'This document does not support export'; $lang->doc->browseReportTemplate = 'Report Template Home'; $lang->doc->browseReport = 'Report Home'; +$lang->doc->createReportTemplate = 'Create Report Template'; $lang->doc->preview = 'Preview'; $lang->doc->insertTitle = 'Insert %s list'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index cb63c6ea05..8b2951478e 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -106,6 +106,8 @@ $lang->docTemplate->editedList = '模板编辑者'; $lang->docTemplate->content = '模板内容'; $lang->docTemplate->templateDesc = '模板描述'; $lang->docTemplate->status = '模板状态'; +$lang->docTemplate->noReportTemplate = '没有报告模板'; +$lang->docTemplate->createReportTemplate = '创建报告模板'; $lang->docTemplate->more = '更多'; $lang->docTemplate->scopeLabel = '范围'; @@ -315,6 +317,7 @@ $lang->doc->moveTo = '移动至'; $lang->doc->notSupportExport = '（此文档暂不支持导出）'; $lang->doc->browseReportTemplate = '报告模板首页'; $lang->doc->browseReport = '报告首页'; +$lang->doc->createReportTemplate = '创建报告模板'; $lang->doc->preview = '预览'; $lang->doc->insertTitle = '插入%s列表'; diff --git a/module/doc/ui/browsereporttemplate.html.php b/module/doc/ui/browsereporttemplate.html.php index 5ae5ffb2cc..0e010f54b7 100644 --- a/module/doc/ui/browsereporttemplate.html.php +++ b/module/doc/ui/browsereporttemplate.html.php @@ -9,3 +9,6 @@ declare(strict_types=1); * @link https://www.zentao.net */ namespace zin; + +if($mode == 'home' || !$libID) include './reporttemplatehome.html.php'; +else include './reporttemplatelist.html.php'; diff --git a/module/group/lang/de.php b/module/group/lang/de.php index dc6f406f56..c464758a07 100644 --- a/module/group/lang/de.php +++ b/module/group/lang/de.php @@ -605,5 +605,6 @@ $lang->group->package->trainPracticeLib = 'Practice Library'; $lang->group->package->application = 'Manage Application'; $lang->group->package->component = 'Component'; $lang->group->package->browseReportTemplate = 'Browse Report and Template'; +$lang->group->package->manageReportTemplate = 'Create and Manage Report and Template'; include (dirname(__FILE__) . '/resource.php'); diff --git a/module/group/lang/en.php b/module/group/lang/en.php index f4aed50517..cee6f2476b 100644 --- a/module/group/lang/en.php +++ b/module/group/lang/en.php @@ -605,5 +605,6 @@ $lang->group->package->trainPracticeLib = 'Practice Library'; $lang->group->package->application = 'Manage Application'; $lang->group->package->component = 'Component'; $lang->group->package->browseReportTemplate = 'Browse Report and Template'; +$lang->group->package->manageReportTemplate = 'Create and Manage Report and Template'; include (dirname(__FILE__) . '/resource.php'); diff --git a/module/group/lang/fr.php b/module/group/lang/fr.php index 1ce9b20cde..4748047cee 100644 --- a/module/group/lang/fr.php +++ b/module/group/lang/fr.php @@ -605,5 +605,6 @@ $lang->group->package->trainPracticeLib = 'Practice Library'; $lang->group->package->application = 'Manage Application'; $lang->group->package->component = 'Component'; $lang->group->package->browseReportTemplate = 'Browse Report and Template'; +$lang->group->package->manageReportTemplate = 'Create and Manage Report and Template'; include (dirname(__FILE__) . '/resource.php'); diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 37e7894fcf..3a0d85745d 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1547,6 +1547,7 @@ $lang->resource->doc->sortChapter = 'sortChapter'; $lang->resource->doc->deleteChapter = 'deleteChapter'; $lang->resource->doc->browseReportTemplate = 'browseReportTemplate'; $lang->resource->doc->browseReport = 'browseReport'; +$lang->resource->doc->createReportTemplate = 'createReportTemplate'; $lang->doc->methodOrder[5] = 'index'; $lang->doc->methodOrder[10] = 'mySpace'; @@ -1582,6 +1583,7 @@ $lang->doc->methodOrder[180] = 'sortChapter'; $lang->doc->methodOrder[190] = 'deleteChapter'; $lang->doc->methodOrder[195] = 'browseReportTemplate'; $lang->doc->methodOrder[200] = 'browseReport'; +$lang->doc->methodOrder[205] = 'createReportTemplate'; /* Mail. */ $lang->resource->mail = new stdclass(); diff --git a/module/group/lang/zh-cn.php b/module/group/lang/zh-cn.php index 4a29f01c23..7412507915 100644 --- a/module/group/lang/zh-cn.php +++ b/module/group/lang/zh-cn.php @@ -605,5 +605,6 @@ $lang->group->package->trainPracticeLib = '实践库'; $lang->group->package->application = '管理应用'; $lang->group->package->component = '组件'; $lang->group->package->browseReportTemplate = '浏览报告和模板'; +$lang->group->package->manageReportTemplate = '创建与维护报告和模板'; include (dirname(__FILE__) . '/resource.php'); diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index e9aaf2d405..08acfa8363 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -3590,6 +3590,12 @@ $config->group->package->browseReportTemplate->privs = array(); $config->group->package->browseReportTemplate->privs['doc-browseReportTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array()); $config->group->package->browseReportTemplate->privs['doc-browseReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array(), 'recommend' => array()); +$config->group->package->manageReportTemplate = new stdclass(); +$config->group->package->manageReportTemplate->order = 5; +$config->group->package->manageReportTemplate->subset = 'reporttemplate'; +$config->group->package->manageReportTemplate->privs = array(); +$config->group->package->manageReportTemplate->privs['doc-createReportTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array()); + $config->group->package->browseDoc = new stdclass(); $config->group->package->browseDoc->order = 10; $config->group->package->browseDoc->subset = 'doc';