From 1cda789cb654975ee0b2e5722ce88a61d4668390 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Thu, 15 May 2025 08:42:45 +0000
Subject: [PATCH]  * [task#142969,doing.3h] Upgrade template types.

---
 module/doc/config.php                         | 105 ---------------
 module/doc/model.php                          | 121 ++----------------
 module/doc/test/lib/doc.unittest.class.php    |  30 +----
 .../test/model/isbuiltintemplatemodule.php    |  40 ------
 .../model/upgradebuiltintemplatetypes.php     |  75 -----------
 ...latetypes.php => upgradetemplatetypes.php} |  20 +--
 module/tree/ui/edit.html.php                  |   3 -
 module/upgrade/control.php                    |   6 +-
 8 files changed, 24 insertions(+), 376 deletions(-)
 delete mode 100755 module/doc/test/model/isbuiltintemplatemodule.php
 delete mode 100644 module/doc/test/model/upgradebuiltintemplatetypes.php
 rename module/doc/test/model/{upgradecustomtemplatetypes.php => upgradetemplatetypes.php} (66%)

diff --git a/module/doc/config.php b/module/doc/config.php
index 23227c3f40..1d552db752 100644
--- a/module/doc/config.php
+++ b/module/doc/config.php
@@ -136,111 +136,6 @@ $config->doc->templateMenu[2] = array('id' => 2, 'name' => $lang->docTemplate->s
 $config->doc->templateMenu[3] = array('id' => 3, 'name' => $lang->docTemplate->scopes[3]);
 $config->doc->templateMenu[4] = array('id' => 4, 'name' => $lang->docTemplate->scopes[4]);
 
-$config->doc->templateModule = array();
-$config->doc->templateModule[1] = array();
-$config->doc->templateModule[1]['plan'] = array();
-$config->doc->templateModule[1]['plan']['softwareProductPlan']  = 'Software product plan';
-$config->doc->templateModule[1]['plan']['hardwareProductPlan']  = 'Hardware product plan';
-$config->doc->templateModule[1]['plan']['qualityAssurancePlan'] = 'Quality assurance plan';
-
-$config->doc->templateModule[1]['desc'] = array();
-$config->doc->templateModule[1]['desc']['productDesign']            = 'Product design';
-$config->doc->templateModule[1]['desc']['requirementSpecification'] = 'Requirement specification';
-$config->doc->templateModule[1]['desc']['userManual']               = 'User manual';
-
-$config->doc->templateModule[1]['report'] = array();
-$config->doc->templateModule[1]['report']['competitiveProductAnalysisReport'] = 'Competitive product analysis report';
-$config->doc->templateModule[1]['report']['productAcceptanceReport']          = 'Product acceptance report';
-$config->doc->templateModule[1]['report']['productSummaryReport']             = 'Product summary report';
-$config->doc->templateModule[1]['report']['productQualityReport']             = 'Product quality report';
-
-$config->doc->templateModule[2] = array();
-$config->doc->templateModule[2]['plan'] = array();
-$config->doc->templateModule[2]['plan']['projectPlan']                        = 'Project plan';
-$config->doc->templateModule[2]['plan']['projectQualityAssurancePlan']        = 'Project quality assurance plan';
-$config->doc->templateModule[2]['plan']['projectConfigurationManagementPlan'] = 'Project configuration management plan';
-$config->doc->templateModule[2]['plan']['projectIntegrationTestPlan']         = 'Project integration test plan';
-$config->doc->templateModule[2]['plan']['projectSystemTestPlan']              = 'Project system test plan';
-
-$config->doc->templateModule[2]['desc'] = array();
-$config->doc->templateModule[2]['desc']['businessRequirementsStatement']            = 'Business requirements statement';
-$config->doc->templateModule[2]['desc']['projectUserRequirementsSpecification']     = 'Project user requirements specification';
-$config->doc->templateModule[2]['desc']['projectSoftwareRequirementsSpecification'] = 'Project software requirements specification';
-$config->doc->templateModule[2]['desc']['projectSummaryDesignSpecification']        = 'Project summary design specification';
-$config->doc->templateModule[2]['desc']['projectDetailedDesignSpecification']       = 'Project detailed design specification';
-$config->doc->templateModule[2]['desc']['projectUserManual']                        = 'Project user manual';
-
-$config->doc->templateModule[2]['dev']  = array();
-$config->doc->templateModule[2]['dev']['projectCode']                    = 'Project code';
-$config->doc->templateModule[2]['dev']['projectDatabaseDesignDocument']  = 'Project database design document';
-$config->doc->templateModule[2]['dev']['projectInterfaceDesignDocument'] = 'Project interface design document';
-
-$config->doc->templateModule[2]['test']  = array();
-$config->doc->templateModule[2]['test']['projectIntegrationTestCases'] = 'Project integration test cases';
-$config->doc->templateModule[2]['test']['projectSystemTestCases']      = 'Project system test cases';
-
-$config->doc->templateModule[2]['report']  = array();
-$config->doc->templateModule[2]['report']['projectProgressReport']   = 'Project progress report';
-$config->doc->templateModule[2]['report']['projectRiskReport']       = 'Project risk report';
-$config->doc->templateModule[2]['report']['projectAcceptanceReport'] = 'Project acceptance report';
-$config->doc->templateModule[2]['report']['projectSummaryReport']    = 'Project summary report';
-$config->doc->templateModule[2]['report']['projectQualityReport']    = 'Project quality report';
-
-$config->doc->templateModule[2]['other']  = array();
-
-$config->doc->templateModule[3] = array();
-$config->doc->templateModule[3]['plan'] = array();
-$config->doc->templateModule[3]['plan']['executionDevelopmentPlan']      = 'Execution development plan';
-$config->doc->templateModule[3]['plan']['executionQualityAssurancePlan'] = 'Execution quality assurance plan';
-$config->doc->templateModule[3]['plan']['executionTestPlan']             = 'Execution test plan';
-
-$config->doc->templateModule[3]['desc'] = array();
-$config->doc->templateModule[3]['desc']['executionSoftwareRequirementsSpecification'] = 'Execution software requirements specification';
-$config->doc->templateModule[3]['desc']['executionArchitecturalDesignSpecification']  = 'Execution architectural design specification';
-$config->doc->templateModule[3]['desc']['executionCodeDesignSpecification']           = 'Execution code design specification';
-
-$config->doc->templateModule[3]['dev'] = array();
-$config->doc->templateModule[3]['dev']['executionCode']                    = 'Execution code';
-$config->doc->templateModule[3]['dev']['executionDatabaseDesignDocument']  = 'Execution database design document';
-$config->doc->templateModule[3]['dev']['executionInterfaceDesignDocument'] = 'Execution interface design document';
-
-$config->doc->templateModule[3]['test'] = array();
-$config->doc->templateModule[3]['test']['executionFunctionalTesting'] = 'Execution functional testing';
-$config->doc->templateModule[3]['test']['executionTestCases']         = 'Execution test cases';
-
-$config->doc->templateModule[3]['report'] = array();
-$config->doc->templateModule[3]['report']['executionProgressReport']   = 'Execution progress report';
-$config->doc->templateModule[3]['report']['executionRiskReport']       = 'Execution risk report';
-$config->doc->templateModule[3]['report']['executionAcceptanceReport'] = 'Execution acceptance report';
-$config->doc->templateModule[3]['report']['executionSummaryReport']    = 'Execution summary report';
-$config->doc->templateModule[3]['report']['executionQualityReport']    = 'Execution quality report';
-
-$config->doc->templateModule[4] = array();
-$config->doc->templateModule[4]['plan'] = array();
-$config->doc->templateModule[4]['plan']['personalWorkPlan'] = 'Personal work plan';
-
-$config->doc->templateModule[4]['report'] = array();
-$config->doc->templateModule[4]['report']['personalWorkSummaryReport']   = 'Personal work summary report';
-$config->doc->templateModule[4]['report']['personalValueAnalysisReport'] = 'Personal value analysis report';
-
-$config->doc->oldTemplateMap = array();
-$config->doc->oldTemplateMap['PP']   = array('scope' => 'project', 'parent' => 'plan', 'key' => 'projectPlan',                              'code' => 'Project plan');
-$config->doc->oldTemplateMap['QAP']  = array('scope' => 'project', 'parent' => 'plan', 'key' => 'projectQualityAssurancePlan',              'code' => 'Project quality assurance plan');
-$config->doc->oldTemplateMap['CMP']  = array('scope' => 'project', 'parent' => 'plan', 'key' => 'projectConfigurationManagementPlan',       'code' => 'Project configuration management plan');
-$config->doc->oldTemplateMap['ITP']  = array('scope' => 'project', 'parent' => 'plan', 'key' => 'projectIntegrationTestPlan',               'code' => 'Project integration test plan');
-$config->doc->oldTemplateMap['STP']  = array('scope' => 'project', 'parent' => 'plan', 'key' => 'projectSystemTestPlan',                    'code' => 'Project system test plan');
-$config->doc->oldTemplateMap['ERS']  = array('scope' => 'project', 'parent' => 'desc', 'key' => 'businessRequirementsStatement',            'code' => 'Business requirements statement');
-$config->doc->oldTemplateMap['URS']  = array('scope' => 'project', 'parent' => 'desc', 'key' => 'projectUserRequirementsSpecification',     'code' => 'Project user requirements specification');
-$config->doc->oldTemplateMap['SRS']  = array('scope' => 'project', 'parent' => 'desc', 'key' => 'projectSoftwareRequirementsSpecification', 'code' => 'Project software requirements specification');
-$config->doc->oldTemplateMap['HLDS'] = array('scope' => 'project', 'parent' => 'desc', 'key' => 'projectSummaryDesignSpecification',        'code' => 'Project summary design specification');
-$config->doc->oldTemplateMap['DDS']  = array('scope' => 'project', 'parent' => 'desc', 'key' => 'projectDetailedDesignSpecification',       'code' => 'Project detailed design specification');
-$config->doc->oldTemplateMap['UM']   = array('scope' => 'project', 'parent' => 'desc', 'key' => 'projectUserManual',                        'code' => 'Project user manual');
-$config->doc->oldTemplateMap['Code'] = array('scope' => 'project', 'parent' => 'dev',  'key' => 'projectCode',                              'code' => 'Project code');
-$config->doc->oldTemplateMap['DBDS'] = array('scope' => 'project', 'parent' => 'dev',  'key' => 'projectDatabaseDesignDocument',            'code' => 'Project database design document');
-$config->doc->oldTemplateMap['ADS']  = array('scope' => 'project', 'parent' => 'dev',  'key' => 'projectInterfaceDesignDocument',           'code' => 'Project interface design document');
-$config->doc->oldTemplateMap['ITTC'] = array('scope' => 'project', 'parent' => 'test', 'key' => 'projectIntegrationTestCases',              'code' => 'Project integration test cases');
-$config->doc->oldTemplateMap['STTC'] = array('scope' => 'project', 'parent' => 'test', 'key' => 'projectSystemTestCases',                   'code' => 'Project system test cases');
-
 $config->doc->zentaoListMenuPosition = 22;
 
 $config->doc->zentaoList = array();
diff --git a/module/doc/model.php b/module/doc/model.php
index af54aa11f9..662f25010a 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -3970,80 +3970,20 @@ class docModel extends model
     }
 
     /**
-     * 插入内置模板类型数据。
-     * Insert builtin doc template types.
+     * 升级模板类型数据。
+     * Upgrade document template types.
      *
      * @access public
      * @return bool
      */
-    public function upgradeBuiltinTemplateTypes()
-    {
-        $currentLang = $this->app->getClientLang();
-
-        $oldTemplateTypes = $this->dao->select('`key`, `value`')->from(TABLE_LANG)
-            ->where('module')->eq('baseline')
-            ->andWhere('section')->eq('objectList')
-            ->andWhere('lang')->eq($currentLang)
-            ->andWhere('system')->eq('1')
-            ->fetchPairs();
-
-        $currentTemplateTypes = array();
-        foreach($this->config->doc->oldTemplateMap as $templateTypeKey => $templateType)
-        {
-            $currentKey = $templateType['key'];
-            $currentTemplateTypes[$currentKey] = isset($oldTemplateTypes[$templateTypeKey]) ? $oldTemplateTypes[$templateTypeKey] : false;
-        }
-
-        foreach($this->config->doc->templateModule as $scope => $moduleList)
-        {
-            foreach($moduleList as $moduleKey => $subModuleList)
-            {
-                $moduleName = $this->lang->docTemplate->moduleName[$moduleKey];
-                $moduleCode = ucfirst($this->config->doc->scopeMaps[$scope]) . ' ' . $moduleKey;
-                $module = $this->buildTemplateModule($scope, 0, $moduleName, $moduleCode, 1);
-                $this->dao->insert(TABLE_MODULE)->data($module)->exec();
-                if(dao::isError()) return false;
-
-                $moduleID = $this->dao->lastInsertID();
-                $this->dao->update(TABLE_MODULE)->set('path')->eq(",{$moduleID},")->where('id')->eq($moduleID)->exec();
-
-                foreach($subModuleList as $subModuleKey => $subModuleCode)
-                {
-                    if(isset($currentTemplateTypes[$subModuleKey]) && $currentTemplateTypes[$subModuleKey] === false) continue;
-
-                    $subModuleName = isset($currentTemplateTypes[$subModuleKey]) ? $currentTemplateTypes[$subModuleKey] : $this->lang->docTemplate->moduleName[$subModuleKey];
-                    $subModule = $this->buildTemplateModule($scope, $moduleID, $subModuleName, $subModuleCode, 2);
-                    $this->dao->insert(TABLE_MODULE)->data($subModule)->exec();
-                    if(dao::isError()) return false;
-
-                    $subModuleID = $this->dao->lastInsertID();
-                    $this->dao->update(TABLE_MODULE)->set('path')->eq(",{$moduleID},{$subModuleID},")->where('id')->eq($subModuleID)->exec();
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * 升级用户自定义模板类型数据。
-     * Upgrade custom doc template types.
-     *
-     * @access public
-     * @return bool
-     */
-    public function upgradeCustomTemplateTypes()
+    public function upgradeTemplateTypes()
     {
         $currentLang = $this->app->getClientLang();
 
         $currentTemplateTypes = $this->dao->select('`key`,`value`')->from(TABLE_LANG)
             ->where('module')->eq('baseline')
             ->andWhere('section')->eq('objectList')
-            ->andWhere('(system', true)->eq('0')
             ->andWhere('lang')->in("all,$currentLang")
-            ->markRight(1)
-            ->orWhere('(system')->eq('1')
-            ->andWhere('lang')->eq('all')
-            ->markRight(2)
             ->fetchPairs();
 
         $usedTemplateTypes = $this->dao->select('`key`, `value`')->from(TABLE_LANG)->alias('t1')
@@ -4054,19 +3994,18 @@ class docModel extends model
             ->andWhere('t2.templateType')->ne('')
             ->fetchPairs();
 
-        $oldTemplateTypes = arrayUnion($currentTemplateTypes, $usedTemplateTypes);
+        $oldTemplateTypes = array_filter(arrayUnion($currentTemplateTypes, $usedTemplateTypes));
 
         if(empty($oldTemplateTypes)) return true;
 
-        $parentID = $this->dao->select('id')->from(TABLE_MODULE)->where('short')->eq('Project other')->fetch('id');
         foreach($oldTemplateTypes as $key => $value)
         {
-            $module = $this->buildTemplateModule(2, $parentID, $value, $key, 2);
+            $module = $this->buildTemplateModule(2, 0, $value, $key);
             $this->dao->insert(TABLE_MODULE)->data($module)->exec();
             if(dao::isError()) return false;
 
             $moduleID = $this->dao->lastInsertID();
-            $this->dao->update(TABLE_MODULE)->set('path')->eq(",{$parentID},{$moduleID},")->where('id')->eq($moduleID)->exec();
+            $this->dao->update(TABLE_MODULE)->set('path')->eq(",{$moduleID},")->where('id')->eq($moduleID)->exec();
         }
 
         return true;
@@ -4082,25 +4021,15 @@ class docModel extends model
      */
     public function upgradeTemplateLibAndModule(array $templateIdList = array())
     {
-        $templateList = $this->dao->select('*')->from(TABLE_DOC)
-            ->where('id')->in($templateIdList)
-            ->fetchAll('id');
+        $templateList = $this->dao->select('*')->from(TABLE_DOC)->where('id')->in($templateIdList)->fetchAll('id');
         if(empty($templateList)) return true;
 
-        $modulePairs = $this->dao->select('short,id')->from(TABLE_MODULE)
-            ->where('deleted')->eq(0)
-            ->andWhere('type')->eq('docTemplate')
-            ->fetchPairs();
-
-        $scopeMaps = array_flip($this->config->doc->scopeMaps);
+        $scopeMaps   = array_flip($this->config->doc->scopeMaps);
+        $modulePairs = $this->dao->select('short,id')->from(TABLE_MODULE)->where('deleted')->eq('0')->andWhere('type')->eq('docTemplate')->fetchPairs();
         foreach($templateList as $id => $template)
         {
-            $belongBuiltinType = in_array($template->templateType, array_keys($this->config->doc->oldTemplateMap));
-            if($belongBuiltinType) $templateMap = $this->config->doc->oldTemplateMap[$template->templateType];
-
-            $template->lib          = $belongBuiltinType ? $scopeMaps[$templateMap['scope']] : $scopeMaps['project'];
-            $template->templateType = $belongBuiltinType ? $templateMap['code'] : $template->templateType;
-            $template->module       = zget($modulePairs, $template->templateType, zget($modulePairs, 'Project other', 0));
+            $template->lib    = $scopeMaps['project'];
+            $template->module = zget($modulePairs, $template->templateType, 0);
             $this->dao->update(TABLE_DOC)->data($template)->where('id')->eq($id)->exec();
             if(dao::isError()) return false;
         }
@@ -4199,34 +4128,6 @@ class docModel extends model
             ->fetchAll('', false);
     }
 
-    /**
-     * 判断一个模块是否是内置的文档模板类型。
-     * Judge whether a module is builtin template type.
-     *
-     * @param  object $module
-     * @access public
-     * @return bool
-     */
-    public function isBuiltinTemplateModule($module)
-    {
-        if(!$module->short || $module->type != 'docTemplate') return false;
-
-        foreach($this->config->doc->templateModule as $scope => $moduleList)
-        {
-            foreach($moduleList as $moduleKey => $subModuleList)
-            {
-                if($module->short == ucfirst($this->config->doc->scopeMaps[$scope]) . ' ' . $moduleKey) return true;
-
-                foreach($subModuleList as $subModuleCode)
-                {
-                    if($module->short == $subModuleCode) return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
     /**
      * 删除一个文档模板。
      * Delete a doc template.
diff --git a/module/doc/test/lib/doc.unittest.class.php b/module/doc/test/lib/doc.unittest.class.php
index aadd22e88c..056d08bd24 100644
--- a/module/doc/test/lib/doc.unittest.class.php
+++ b/module/doc/test/lib/doc.unittest.class.php
@@ -1525,32 +1525,6 @@ class docTest
         return $templateModules;
     }
 
-    /**
-     * 检查模板模块是否是内置。
-     * Check template module is builtin or not.
-     *
-     * @param  object    $module
-     * @access public
-     * @return bool
-     */
-    public function isBuiltinTemplateModuleTest($module)
-    {
-        return $this->objectModel->isBuiltinTemplateModule($module);
-    }
-
-    /**
-     * 插入内置模板类型数据。
-     * Insert builtin doc template types.
-     *
-     * @access public
-     * @return bool
-     */
-    public function upgradeBuiltinTemplateTypesTest()
-    {
-        $this->objectModel->upgradeBuiltinTemplateTypes();
-        return $this->objectModel->dao->select('*')->from(TABLE_MODULE)->fetchAll('id');
-    }
-
     /**
      * 获取范围下最近编辑的模板。
      * Get templates of scope.
@@ -1603,9 +1577,9 @@ class docTest
      * @access public
      * @return bool
      */
-    public function upgradeCustomTemplateTypesTest(int $moduleID)
+    public function upgradeTemplateTypesTest(int $moduleID)
     {
-        $this->objectModel->upgradeCustomTemplateTypes();
+        $this->objectModel->upgradeTemplateTypes();
         return $this->objectModel->dao->select('*')->from(TABLE_MODULE)->where('id')->eq($moduleID)->fetch();
     }
 
diff --git a/module/doc/test/model/isbuiltintemplatemodule.php b/module/doc/test/model/isbuiltintemplatemodule.php
deleted file mode 100755
index 14a604b52d..0000000000
--- a/module/doc/test/model/isbuiltintemplatemodule.php
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
-
-title=测试 docModel->checkApiLibName();
-timeout=0
-cid=1
-
-- 一级模板类型 @1
-- short为空的类型 @0
-- 类型为doc的类型 @0
-- 二级模板类型 @1
-
-*/
-
-include dirname(__FILE__, 5) . '/test/lib/init.php';
-include dirname(__FILE__, 2) . '/lib/doc.unittest.class.php';
-
-$module1 = new stdclass();
-$module1->short = 'Product plan';
-$module1->type  = 'docTemplate';
-
-$module2 = new stdclass();
-$module2->short = '';
-$module2->type  = 'docTemplate';
-
-$module3 = new stdclass();
-$module3->short = 'Product plan';
-$module3->type  = 'doc';
-
-$module4 = new stdclass();
-$module4->short = 'Software product plan';
-$module4->type  = 'docTemplate';
-
-$docTester = new docTest();
-r($docTester->isBuiltinTemplateModuleTest($module1)) && p() && e(1); //一级模板类型
-r($docTester->isBuiltinTemplateModuleTest($module2)) && p() && e(0); //short为空的类型
-r($docTester->isBuiltinTemplateModuleTest($module3)) && p() && e(0); //类型为doc的类型
-r($docTester->isBuiltinTemplateModuleTest($module4)) && p() && e(1); //二级模板类型
\ No newline at end of file
diff --git a/module/doc/test/model/upgradebuiltintemplatetypes.php b/module/doc/test/model/upgradebuiltintemplatetypes.php
deleted file mode 100644
index 27bf3e6d11..0000000000
--- a/module/doc/test/model/upgradebuiltintemplatetypes.php
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(__FILE__, 5) . '/test/lib/init.php';
-include dirname(__FILE__, 2) . '/lib/doc.unittest.class.php';
-
-/**
-
-title=测试 docModel->upgradeBuiltinTemplateTypes();
-timeout=0
-cid=1
-
-- 产品范围计划类型存储信息
- - 第1条的id属性 @1
- - 第1条的root属性 @1
- - 第1条的name属性 @计划
- - 第1条的parent属性 @0
- - 第1条的short属性 @Product plan
-- 软件产品计划类型存储信息
- - 第2条的id属性 @2
- - 第2条的root属性 @1
- - 第2条的name属性 @软件产品计划
- - 第2条的parent属性 @1
- - 第2条的short属性 @Software product plan
-- 项目范围计划类型存储信息
- - 第14条的id属性 @14
- - 第14条的root属性 @2
- - 第14条的name属性 @计划
- - 第14条的parent属性 @0
- - 第14条的short属性 @Project plan
-- 项目计划类型存储信息
- - 第15条的id属性 @15
- - 第15条的root属性 @2
- - 第15条的name属性 @项目计划
- - 第15条的parent属性 @14
- - 第15条的short属性 @Project plan
-- 执行范围计划类型存储信息
- - 第41条的id属性 @41
- - 第41条的root属性 @3
- - 第41条的name属性 @计划
- - 第41条的parent属性 @0
- - 第41条的short属性 @Execution plan
-- 执行开发计划类型存储信息
- - 第42条的id属性 @42
- - 第42条的root属性 @3
- - 第42条的name属性 @开发计划
- - 第42条的parent属性 @41
- - 第42条的short属性 @Execution development plan
-- 个人范围计划类型存储信息
- - 第62条的id属性 @62
- - 第62条的root属性 @4
- - 第62条的name属性 @计划
- - 第62条的parent属性 @0
- - 第62条的short属性 @Personal plan
-- 个人工作计划类型存储信息
- - 第63条的id属性 @63
- - 第63条的root属性 @4
- - 第63条的name属性 @工作计划
- - 第63条的parent属性 @62
- - 第63条的short属性 @Personal work plan
-
-*/
-
-zenData('module')->gen(0);
-zenData('user')->gen(5);
-su('admin');
-
-$docTester = new docTest();
-r($docTester->upgradeBuiltinTemplateTypesTest())  && p('1:id,root,name,parent,short')  && e('1,1,计划,0,Product plan');                     // 产品范围计划类型存储信息
-r($docTester->upgradeBuiltinTemplateTypesTest())  && p('2:id,root,name,parent,short')  && e('2,1,软件产品计划,1,Software product plan');    // 软件产品计划类型存储信息
-r($docTester->upgradeBuiltinTemplateTypesTest())  && p('14:id,root,name,parent,short') && e('14,2,计划,0,Project plan');                    // 项目范围计划类型存储信息
-r($docTester->upgradeBuiltinTemplateTypesTest())  && p('15:id,root,name,parent,short') && e('15,2,项目计划,14,Project plan');               // 项目计划类型存储信息
-r($docTester->upgradeBuiltinTemplateTypesTest())  && p('41:id,root,name,parent,short') && e('41,3,计划,0,Execution plan');                  // 执行范围计划类型存储信息
-r($docTester->upgradeBuiltinTemplateTypesTest())  && p('42:id,root,name,parent,short') && e('42,3,开发计划,41,Execution development plan'); // 执行开发计划类型存储信息
-r($docTester->upgradeBuiltinTemplateTypesTest())  && p('62:id,root,name,parent,short') && e('62,4,计划,0,Personal plan');                   // 个人范围计划类型存储信息
-r($docTester->upgradeBuiltinTemplateTypesTest())  && p('63:id,root,name,parent,short') && e('63,4,工作计划,62,Personal work plan');         // 个人工作计划类型存储信息
diff --git a/module/doc/test/model/upgradecustomtemplatetypes.php b/module/doc/test/model/upgradetemplatetypes.php
similarity index 66%
rename from module/doc/test/model/upgradecustomtemplatetypes.php
rename to module/doc/test/model/upgradetemplatetypes.php
index 2191621d8a..1e36616457 100755
--- a/module/doc/test/model/upgradecustomtemplatetypes.php
+++ b/module/doc/test/model/upgradetemplatetypes.php
@@ -12,31 +12,31 @@ cid=1
  - 属性root @2
  - 属性parent @1
  - 属性grade @2
- - 属性path @,1,2,
+ - 属性path @,2,
 - 自定义模板2
  - 属性type @docTemplate
  - 属性root @2
  - 属性parent @1
  - 属性grade @2
- - 属性path @,1,3,
+ - 属性path @,3,
 - 自定义模板4
  - 属性type @docTemplate
  - 属性root @2
  - 属性parent @1
  - 属性grade @2
- - 属性path @,1,4,
+ - 属性path @,4,
 - 自定义模板5
  - 属性type @docTemplate
  - 属性root @2
  - 属性parent @1
  - 属性grade @2
- - 属性path @,1,5,
+ - 属性path @,5,
 - 自定义模板6
  - 属性type @docTemplate
  - 属性root @2
  - 属性parent @1
  - 属性grade @2
- - 属性path @,1,6,
+ - 属性path @,6,
 
 */
 
@@ -68,8 +68,8 @@ $newModule->short->range('Project other');
 $newModule->gen(1);
 
 $docTester = new docTest();
-r($docTester->upgradeCustomTemplateTypesTest(2))  && p('type|root|parent|grade|path', '|') && e('docTemplate|2|1|2|,1,2,'); // 自定义模板1
-r($docTester->upgradeCustomTemplateTypesTest(3))  && p('type|root|parent|grade|path', '|') && e('docTemplate|2|1|2|,1,3,'); // 自定义模板2
-r($docTester->upgradeCustomTemplateTypesTest(4))  && p('type|root|parent|grade|path', '|') && e('docTemplate|2|1|2|,1,4,'); // 自定义模板4
-r($docTester->upgradeCustomTemplateTypesTest(5))  && p('type|root|parent|grade|path', '|') && e('docTemplate|2|1|2|,1,5,'); // 自定义模板5
-r($docTester->upgradeCustomTemplateTypesTest(6))  && p('type|root|parent|grade|path', '|') && e('docTemplate|2|1|2|,1,6,'); // 自定义模板6
+r($docTester->upgradeTemplateTypesTest(2))  && p('type|root|parent|grade|path', '|') && e('docTemplate|2|1|2|,2,'); // 自定义模板1
+r($docTester->upgradeTemplateTypesTest(3))  && p('type|root|parent|grade|path', '|') && e('docTemplate|2|1|2|,3,'); // 自定义模板2
+r($docTester->upgradeTemplateTypesTest(4))  && p('type|root|parent|grade|path', '|') && e('docTemplate|2|1|2|,4,'); // 自定义模板4
+r($docTester->upgradeTemplateTypesTest(5))  && p('type|root|parent|grade|path', '|') && e('docTemplate|2|1|2|,5,'); // 自定义模板5
+r($docTester->upgradeTemplateTypesTest(6))  && p('type|root|parent|grade|path', '|') && e('docTemplate|2|1|2|,6,'); // 自定义模板6
\ No newline at end of file
diff --git a/module/tree/ui/edit.html.php b/module/tree/ui/edit.html.php
index 8d9074574e..76873cd8cc 100644
--- a/module/tree/ui/edit.html.php
+++ b/module/tree/ui/edit.html.php
@@ -21,7 +21,6 @@ jsVar('type', $type);
 
 /* zin: Set variables to define control for form. */
 $hidden = $type != 'story' && $module->type == 'story';
-$isBuiltinTemplateModule = $type == 'docTemplate' && $this->loadModel('doc')->isBuiltinTemplateModule($module);
 
 /* ====== Define the page structure with zin widgets ====== */
 if($type != 'docTemplate') modalHeader(set::title($title));
@@ -92,7 +91,6 @@ formPanel
         set::label($type == 'docTemplate' ? $lang->docTemplate->scope : $lang->doc->lib),
         picker
         (
-            set::disabled($isBuiltinTemplateModule),
             set::name('root'),
             set::value($module->root),
             set::items($type == 'docTemplate' ? $scopes : $libs),
@@ -107,7 +105,6 @@ formPanel
         set::label(($type == 'doc' || $type == 'api') ? $lang->tree->parentCate : $lang->tree->parent),
         picker
         (
-            set::disabled($isBuiltinTemplateModule),
             set::name('parent'),
             set::value($module->parent),
             set::items($optionMenu),
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 34d3459877..deb842e2ef 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -975,11 +975,7 @@ class upgrade extends control
             return $this->locate(inlink('afterExec', "fromVersion={$fromVersion}&processed=no&skipMoveFile=yes&skipUpdateDocs=yes&skipUpdateDocTemplates=yes"));
         }
 
-        if(!$this->doc->checkIsTemplateUpgraded())
-        {
-            $this->doc->upgradeBuiltinTemplateTypes();
-            $this->doc->upgradeCustomTemplateTypes();
-        }
+        if(!$this->doc->checkIsTemplateUpgraded()) $this->doc->upgradeTemplateTypes();
 
         $this->view->title               = $this->lang->upgrade->upgradeDocTemplates;
         $this->view->upgradeDocTemplates = $upgradeDocTemplates;