From 96b28fdfa323c6145ec47d74f1a5ac1c479ea60f Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Tue, 5 Sep 2023 15:20:24 +0800
Subject: [PATCH] * Fix bug #38242.

---
 config/zentaopms.php                | 1 +
 module/action/lang/zh-cn.php        | 2 +-
 module/action/model.php             | 4 ++--
 module/instance/control.php         | 1 +
 module/instance/ui/setting.html.php | 2 ++
 module/space/control.php            | 1 +
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config/zentaopms.php b/config/zentaopms.php
index 03b30302eb..295418de04 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -290,6 +290,7 @@ $config->openMethods[] = 'jenkins.edit';
 $config->openMethods[] = 'instance.createexternalapp';
 $config->openMethods[] = 'instance.editexternalapp';
 $config->openMethods[] = 'instance.deleteexternalapp';
+$config->openMethods[] = 'instance.setting';
 $config->openMethods[] = 'search.deletezinquery';
 $config->openMethods[] = 'space.edit';
 $config->openMethods[] = 'space.binduser';
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index e1c74f9209..453076bba0 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -304,7 +304,7 @@ $lang->action->desc->uninstall               = '$date, 由 <strong>$actor</stron
 $lang->action->desc->start                   = '$date, 由 <strong>$actor</strong> 启动。' . "\n";
 $lang->action->desc->stop                    = '$date, 由 <strong>$actor</strong> 关闭。' . "\n";
 $lang->action->desc->editname                = '$date, 由 <strong>$actor</strong> 修改了名称，从 <strong>$oldName</strong> 修改为 <strong>$newName</strong> 。' . "\n";
-$lang->action->desc->upgrade                 = '$date, 由 <strong>$actor</strong> 升级，从 $oldVersion<strong> 升级为 <strong>$newVersion</strong> 。' . "\n";
+$lang->action->desc->upgrade                 = '$date, 由 <strong>$actor</strong> 升级，从 <strong>$oldVersion</strong> 升级为 <strong>$newVersion</strong> 。' . "\n";
 $lang->action->desc->backup                  = '$date, 由 <strong>$actor</strong> 备份。' . "\n";
 $lang->action->desc->adjustmemory            = '$date, 由 <strong>$actor</strong> 调整内存到 <strong>$newMemory</strong> 。' . "\n";
 $lang->action->desc->enableldap              = '$date, 由 <strong>$actor</strong> 启用了LDAP。' . "\n";
diff --git a/module/action/model.php b/module/action/model.php
index 8b36fe0e92..22f14753a0 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -934,7 +934,7 @@ class actionModel extends model
      */
     public function renderAction($action, $desc = '')
     {
-        if(!isset($action->objectType) || !isset($action->action)) return false;
+        if(!isset($action->objectType) || !isset($action->action)) return;
 
         $objectType = $action->objectType;
         $actionType = strtolower($action->action);
@@ -1002,7 +1002,7 @@ class actionModel extends model
                     $action->extra = '';
 
                     if(!empty($extra->result->code) && $extra->result->code != 200 && !empty($extra->result->message)) $action->comment = $extra->result->message;
-                    if(is_string($extra->result) && $extra->result != 'fail')
+                    if(is_string($extra->result) && $extra->result != 'fail' && !empty($extra->message))
                     {
                         $action->comment = "\n" . $extra->message;
                     }
diff --git a/module/instance/control.php b/module/instance/control.php
index 5920958d81..73b8ff0f7b 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -269,6 +269,7 @@ class instance extends control
      */
     public function setting($id)
     {
+        if(!commonModel::hasPriv('instance', 'view')) $this->loadModel('common')->deny('instance', 'view', false);
         $currentResource = new stdclass;
         $instance        = $this->instance->getByID($id);
         $currentResource = $this->cne->getAppConfig($instance);
diff --git a/module/instance/ui/setting.html.php b/module/instance/ui/setting.html.php
index d8b099bb3e..a826630e78 100644
--- a/module/instance/ui/setting.html.php
+++ b/module/instance/ui/setting.html.php
@@ -24,6 +24,7 @@ formPanel
         (
             set::name('name'),
             set::width('500px'),
+            set::required(true),
             set::label($lang->instance->name),
             set::value($instance->name),
         )
@@ -35,6 +36,7 @@ formPanel
             set::name('memory_kb'),
             set::width('250px'),
             set::control('picker'),
+            set::required(true),
             set::label($lang->instance->adjustMem),
             set::value(intval($currentResource->max->memory / 1024)),
             set::items($this->instance->filterMemOptions($currentResource)),
diff --git a/module/space/control.php b/module/space/control.php
index 11104b7c9a..f2e93acfc9 100644
--- a/module/space/control.php
+++ b/module/space/control.php
@@ -121,6 +121,7 @@ class space extends control
         $defaultApp = '';
         foreach($pagedApps->apps as $app)
         {
+            if(in_array($app->id, array(29,51,52,53,54,142))) continue;
             if(!$appID and $app->alias == 'GitLab') $defaultApp = $app->id;
 
             $apps[$app->id] = $app->alias;