diff --git a/module/doc/control.php b/module/doc/control.php index c352d91fbd..4796d2ec36 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -586,6 +586,16 @@ class doc extends control */ public function browseTemplate(int $libID = 0, string $type = 'all', int $docID = 0, string $orderBy = 'id_desc', int $recPerPage = 20, int $pageID = 1, string $mode = 'home') { + /* 添加内置的范围、分类、文档模板。*/ + /* Add the built-in scopes and type and doc template. */ + $builtInScopes = $this->dao->select('id')->from(TABLE_DOCLIB)->where('type')->eq('template')->andWhere('main')->eq('1')->fetchAll(); + if(empty($builtInScopes)) + { + $this->doc->addBuiltInScopes(); + $this->doc->addBuiltInDocTemplateType(); + $this->doc->addBuiltInDocTemplateByType(); + } + $this->lang->doc->menu->template['alias'] .= ',' . $this->app->rawMethod; $libModules = $this->doc->getTemplateModules($libID); if($mode == 'create' && empty($libModules)) return $this->send(array('result' => 'success', 'load' => array('alert' => $this->lang->docTemplate->createTypeFirst))); diff --git a/module/install/control.php b/module/install/control.php index 3cd871dc86..ddc9bcc88e 100644 --- a/module/install/control.php +++ b/module/install/control.php @@ -387,16 +387,6 @@ class install extends control $this->install->enableCache(); - /* 添加内置的范围、分类、文档模板。*/ - /* Add the built-in scopes and type and doc template. */ - if($this->config->edition == 'max' || $this->config->edition == 'ipd') - { - $this->loadModel('doc'); - $this->doc->addBuiltInScopes(); - $this->doc->addBuiltInDocTemplateType(); - $this->doc->addBuiltInDocTemplateByType(); - } - return $this->send(array('result' => 'success', 'load' => inlink('step6'))); }