From 0fb37ae0f6477db15424409a27623bbf0786be20 Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Sat, 5 Jun 2021 15:39:07 +0800
Subject: [PATCH]  * adjust for upgrade.

---
 module/upgrade/control.php             |  2 ++
 module/upgrade/lang/en.php             |  5 +--
 module/upgrade/lang/zh-cn.php          |  5 +--
 module/upgrade/model.php               | 14 ++++++--
 module/upgrade/view/afterexec.html.php | 50 ++------------------------
 5 files changed, 18 insertions(+), 58 deletions(-)

diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index fcc473502f..cff56ea18d 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -23,6 +23,8 @@ class upgrade extends control
         $upgradeFile = $this->app->wwwRoot . 'upgrade.php';
         if(!file_exists($upgradeFile)) $this->locate($this->createLink('my', 'index'));
 
+        $this->upgrade->deleteTmpModel();
+
         $systemMode = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=mode');
         if(empty($systemMode) && !isset($this->config->qcVersion))
         {
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 2ed7fde3cb..fd19aaacea 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -106,9 +106,6 @@ $lang->upgrade->mergeByProduct     = "PRODUCT-BASED iterations: You can select m
 $lang->upgrade->mergeByProject     = "Independent iterations: You can select several iterations and merge them into one large project, or merge them independently";
 $lang->upgrade->mergeByMoreLink    = "Iteration that relates multiple products: select which product the iteration belongs to.";
 $lang->upgrade->mergeRepoTips      = "Merge the selected version library under the selected product.";
-
-$lang->upgrade->needBuild4Add    = 'Full text retrieval has been added in this upgrad. Please create an index.';
-$lang->upgrade->needBuild4Adjust = 'Full text retrieval has been adjusted. Please create an index.';
-$lang->upgrade->buildIndex       = 'Create Index';
+$lang->upgrade->needBuild4Add      = 'Full text retrieval has been added in this upgrade. Need create index. Please go [Admin->System->BuildIndex] page to build index.';
 
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index e88c5d8b49..d742489d3f 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -106,9 +106,6 @@ $lang->upgrade->mergeByProduct     = "以产品组织的迭代：可以选择多
 $lang->upgrade->mergeByProject     = "独立的迭代：可以选择若干迭代归并到一个项目中，也可以独立归并。";
 $lang->upgrade->mergeByMoreLink    = "关联多个产品的迭代：选择这个迭代归属于哪一个产品。";
 $lang->upgrade->mergeRepoTips      = "将选中的版本库归并到所选产品下。";
-
-$lang->upgrade->needBuild4Add    = '本次升级新增全文检索功能，需要创建索引。';
-$lang->upgrade->needBuild4Adjust = '本次升级全文检索功能有调整，需要创建索引。';
-$lang->upgrade->buildIndex       = '创建索引';
+$lang->upgrade->needBuild4Add      = '本次升级需要创建索引。请到 [后台->系统->重建索引] 页面，重新创建索引。';
 
 include dirname(__FILE__) . '/version.php';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index b51ce64e1b..3407232c44 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -987,6 +987,18 @@ class upgradeModel extends model
         return $alterSQL;
     }
 
+    /**
+     * Delete tmp model files.
+     *
+     * @access public
+     * @return void
+     */
+    public function deleteTmpModel()
+    {
+        $tmpModelDir = $this->app->getTmpRoot() . 'model/';
+        foreach(glob($tmpModelDir . '/*.php') as $tmpModelFile) unlink($tmpModelFile);
+    }
+
     /**
      * Delete Useless Files
      *
@@ -1021,8 +1033,6 @@ class upgradeModel extends model
         return $result;
     }
 
-
-
     /**
      * Update ubb code in bug table and user Templates table to html.
      *
diff --git a/module/upgrade/view/afterexec.html.php b/module/upgrade/view/afterexec.html.php
index 04b1a53f30..6a33329788 100644
--- a/module/upgrade/view/afterexec.html.php
+++ b/module/upgrade/view/afterexec.html.php
@@ -87,57 +87,11 @@ function updateFile(link)
 }
 <?php endif;?>
 </script>
-<?php
-if(isset($needProcess['search']))
-{
-    $searchLink = $this->createLink('search', 'buildIndex');
-    $needBuild  = $lang->upgrade->needBuild4Add;
-}
-?>
-<?php if(isset($searchLink)):?>
+<?php if(isset($needProcess['search'])):?>
 <script>
 $(function()
 {
-    $('a#tohome').closest('.message').hide();
-    $('.col-md-6:first').append("<div id='resultBox' class='alert alert-info'><p><?php echo $needBuild;?><a href='<?php echo $searchLink;?>' id='execButton' class='btn btn-primary btn-sm'><?php echo $lang->upgrade->buildIndex;?></a></p></div>");
-    $('#execButton').click(function()
-    {
-        $('#execButton').hide();
-        $.get($(this).attr('href'), function(response)
-        {
-            try
-            {
-                response = $.parseJSON(response);
-                if(response.result == 'finished')
-                {
-                    searchFinish = true;
-                    $('#resultBox').append("<li class='text-success'>" + response.message + "</li>");
-                    <?php
-                    $condition = array();
-                    foreach($needProcess as $processKey => $value) $condition[] = $processKey . 'Finish == true';
-                    $condition = join(' && ', $condition);
-                    ?>
-                    if(<?php echo $condition?>)
-                    {
-                        $.get('<?php echo inlink('afterExec', "fromVersion=$fromVersion&processed=yes")?>');
-                        $('a#tohome').closest('.message').show();
-                    }
-                    return false;
-                }
-                else
-                {
-                    $('#execButton').attr('href', response.next);
-                    $('#resultBox').append("<li class='text-success'>" + response.message + "</li>");
-                    return $('#execButton').click();
-                }
-            }
-            catch(error)
-            {
-                $('#resultBox').append("<li>" + response + "</li>");
-            }
-        });
-        return false;
-    });
+    $('.col-md-6:first').append("<div class='alert alert-info'><p><?php echo $lang->upgrade->needBuild4Add;?></p></div>");
 })
 </script>
 <?php endif;?>