From bdb188702017fa3b6f09df9a431c807354b2f9c5 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@chandao.com>
Date: Mon, 12 May 2025 14:06:15 +0800
Subject: [PATCH]  * [task#142971,doing,1h] Modify the problem of upgrade doc
 template.

---
 module/doc/model.php       | 2 +-
 module/upgrade/control.php | 9 ++++++---
 module/upgrade/model.php   | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index 4bea1f1731..ecfce55ae7 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -4061,7 +4061,7 @@ class docModel extends model
 
             $template->lib          = $belongBuiltinType ? $scopeMaps[$templateMap['scope']] : $scopeMaps['project'];
             $template->templateType = $belongBuiltinType ? $templateMap['code'] : $template->templateType;
-            $template->module       = $modulePairs[$template->templateType];
+            $template->module       = zget($modulePairs, $template->templateType, zget($modulePairs, 'Project other', 0));
             $this->dao->update(TABLE_DOC)->data($template)->where('id')->eq($id)->exec();
             if(dao::isError()) return false;
         }
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 229bfa04a7..4d6db8e15c 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -963,19 +963,22 @@ class upgrade extends control
      */
     public function upgradeDocTemplates(string $fromVersion = '', string $processed = 'no')
     {
+        $this->loadModel('doc');
         $upgradeDocTemplates = $this->session->upgradeDocTemplates;
         if($processed === 'yes' || empty($upgradeDocTemplates))
         {
-            if(!empty($upgradeDocTemplates)) $this->session->set('upgradeDocTemplates', true);
+            if(!empty($upgradeDocTemplates))
+            {
+                $this->session->set('upgradeDocTemplates', true);
+                $this->doc->upgradeTemplateLibAndModule($upgradeDocTemplates['all']);
+            }
             return $this->locate(inlink('afterExec', "fromVersion={$fromVersion}&processed=no&skipMoveFile=yes&skipUpdateDocs=yes&skipUpdateDocTemplates=yes"));
         }
 
-        $this->loadModel('doc');
         if(!$this->doc->checkIsTemplateUpgraded())
         {
             $this->doc->upgradeBuiltinTemplateTypes();
             $this->doc->upgradeCustomTemplateTypes();
-            $this->doc->upgradeTemplateLibAndModule($upgradeDocTemplates['all']);
         }
 
         $this->view->title               = $this->lang->upgrade->upgradeDocTemplates;
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 2855c964ea..97f955627e 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -10953,7 +10953,7 @@ class upgradeModel extends model
             ->andWhere('t1.lib')->eq('')
             ->andWhere('t1.module')->eq('')
             ->fetchAll('id', false);
-        if(empty($templateList)) return true;
+        if(empty($templateList)) return array();
 
         $htmlTemplates = array_filter($templateList, function($template) {return $template->type == 'html';});
         $wikiTemplates = array_filter($templateList, function($template) {return $template->type == 'book';});