From 1ac7493bd3e1e99d3e60fcf02fea7c25b5fe0e34 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Fri, 28 Jul 2023 14:17:52 +0800
Subject: [PATCH] * Add upgrade log of instance module.

---
 module/action/config.php            |  2 +-
 module/instance/control.php         |  1 -
 module/instance/lang/zh-cn.php      |  1 +
 module/instance/ui/upgrade.html.php | 21 ++++++++++++++++-----
 module/instance/zen.php             | 23 -----------------------
 5 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 module/instance/zen.php

diff --git a/module/action/config.php b/module/action/config.php
index 19064eed22..b584b11b62 100755
--- a/module/action/config.php
+++ b/module/action/config.php
@@ -76,7 +76,7 @@ $config->action->majorList['doc']       = array('releaseddoc', 'collected');
 
 $config->action->needGetProjectType       = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis,researchplan,researchreport,';
 $config->action->needGetRelateField       = ',branch,story,productplan,release,task,build,bug,testcase,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,kanbanlane,kanbancolumn,module,review,';
-$config->action->noLinkModules            = ',doclib,module,webhook,gitlab,gitea,gogs,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,traincategory,apistruct,program,product,user,entry,repo,pivot,';
+$config->action->noLinkModules            = ',doclib,module,webhook,gitlab,instance,gitea,gogs,sonarqube,pipeline,jenkins,kanban,kanbanspace,kanbancolumn,kanbanlane,kanbanregion,kanbancard,execution,project,traincategory,apistruct,program,product,user,entry,repo,pivot,';
 $config->action->ignoreObjectType4Dynamic = 'kanbanregion,kanbanlane,kanbancolumn';
 
 $config->action->preferredTypeNum = 10;
diff --git a/module/instance/control.php b/module/instance/control.php
index 1a3f27ece4..b07de285ef 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -327,7 +327,6 @@ class instance extends control
         }
 
         $this->view->title    = $this->lang->instance->upgrade . $instance->name;
-        $this->view->desc     = $this->instanceZen->getLastArticle($instance->appID);
         $this->view->instance = $instance;
 
         $this->display();
diff --git a/module/instance/lang/zh-cn.php b/module/instance/lang/zh-cn.php
index 19319b19ef..e4f4b136fc 100644
--- a/module/instance/lang/zh-cn.php
+++ b/module/instance/lang/zh-cn.php
@@ -20,6 +20,7 @@ $lang->instance->enableSMTP       = '启用SMTP';
 $lang->instance->customSetting    = '自定义配置';
 $lang->instance->upgradeToSenior  = '升级到高级版';
 $lang->instance->updateDomain     = '更新域名';
+$lang->instance->updateLog        = '更新日志';
 $lang->instance->start            = '启动';
 $lang->instance->restart          = '重启';
 $lang->instance->stop             = '关闭';
diff --git a/module/instance/ui/upgrade.html.php b/module/instance/ui/upgrade.html.php
index 545ed809d4..ad0b2cf909 100644
--- a/module/instance/ui/upgrade.html.php
+++ b/module/instance/ui/upgrade.html.php
@@ -16,13 +16,24 @@ formPanel
 (
     set::id('instanceSettingForm'),
     set::title(''),
-    set::actions(array('submit')),
-    set::submitBtnText($lang->instance->upgrade),
-    h::p($desc),
+    set::submitBtnText($lang->confirm),
+    set::actions(array('submit', array('text' => $lang->cancel, 'data-type' => 'submit', 'data-dismiss' => 'modal'))),
     span
     (
-        setClass('p-5'),
-        $lang->instance->notices['confirmUpgrade']
+        setClass('p-4 font-semibold'),
+        icon('exclamation-sign', setClass('text-warning icon-2x align-middle m-2')),
+        $lang->instance->notices['confirmUpgrade'],
+        empty($instance->latestVersion->change_log_url) ? null: a
+        (
+            setClass('ml-5'),
+            set::target('_blank'),
+            set::href($instance->latestVersion->change_log_url),
+            setStyle('color', 'initial'),
+            setStyle('font-weight', 'initial'),
+            setStyle('text-decoration', 'underline'),
+            $lang->instance->updateLog,
+        ),
     ),
+    div(setStyle('height', '20px')),
     input(set::type('hidden'), set::name('confirm'), set::value('yes'))
 );
diff --git a/module/instance/zen.php b/module/instance/zen.php
deleted file mode 100644
index 7aef5cc9ac..0000000000
--- a/module/instance/zen.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-declare(strict_types=1);
-class instanceZen extends instance
-{
-    /**
-     * 获取最新一条app动态。
-     * Get the last article of an app.
-     *
-     * @param  int       $appID
-     * @access protected
-     * @return string
-     */
-    protected function getLastArticle(int $appID): string
-    {
-        $appInfo = $this->store->getAppInfo($appID, true);
-        if(empty($appInfo)) return '';
-
-        $dynamicResult = $this->store->appDynamic($appInfo, 1, 1);
-        if(empty($dynamicResult) || empty($dynamicResult->articles)) return '';
-
-        return $dynamicResult->articles[0]->title;
-    }
-}