From b37b98a84f4928e643cc31c0864f15bbfcc87eec Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 31 Aug 2023 00:55:04 +0000 Subject: [PATCH] * Fix bug#37870 --- module/admin/config.php | 2 +- module/gitea/control.php | 5 +++-- module/instance/control.php | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/module/admin/config.php b/module/admin/config.php index 47722b9ceb..36a6db4e77 100755 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -84,7 +84,7 @@ $config->admin->helpURL['message'] = 'https://www.zentao.net/book/zentaopms/em $config->admin->helpURL['extension'] = 'https://www.zentao.net/book/zentaopms/536.html'; $config->admin->helpURL['dev'] = 'https://www.zentao.net/book/zentaopms/537.html'; $config->admin->helpURL['convert'] = 'https://www.zentao.net/book/zentaopms/656.html'; -$config->admin->helpURL['platform'] = 'https://www.zentao.net/book/zentaopms/656.html'; +$config->admin->helpURL['platform'] = 'https://www.zentao.net/book/zentaopms/1064.html'; $config->admin->helpURL['ai'] = 'https://www.zentao.net/book/zentaopms/'; $config->admin->navsGroup['feature']['my'] = ',todo,block,'; diff --git a/module/gitea/control.php b/module/gitea/control.php index b456373cf3..fd3232e63a 100644 --- a/module/gitea/control.php +++ b/module/gitea/control.php @@ -163,8 +163,9 @@ class gitea extends control $changes = common::createChanges($oldGitea, $gitea); $this->loadModel('action')->logHistory($actionID, $changes); - $response['load'] = true; - $response['result'] = 'success'; + $response['load'] = true; + $response['message'] = zget($this->lang->instance->notices, 'uninstallSuccess'); + $response['result'] = 'success'; return $this->send($response); } diff --git a/module/instance/control.php b/module/instance/control.php index f01b2bcb5b..be25331b2c 100644 --- a/module/instance/control.php +++ b/module/instance/control.php @@ -586,7 +586,7 @@ class instance extends control $instance = $this->loadModel('pipeline')->getByID($instanceID); if(!$instance) return $this->send(array('result' => 'success', 'message' => $this->lang->instance->notices['success'])); - return $this->send($this->fetch($instance->type, 'delete', array('id' => $instance->id))); + return $this->fetch($instance->type, 'delete', array('id' => $instance->id)); } $instance = $this->instance->getByID($instanceID); if(!$instance) return $this->send(array('result' => 'success', 'message' => $this->lang->instance->notices['success'])); @@ -600,7 +600,7 @@ class instance extends control $success = $this->instance->uninstall($instance); $this->action->create('instance', $instance->id, 'uninstall', '', json_encode(array('result' => $success, 'app' => array('alias' => $instance->appName, 'app_version' => $instance->version)))); - if($success) return $this->send(array('result' => 'success', 'message' => zget($this->lang->instance->notices, 'uninstallSuccess'), 'locate' => $this->createLink('space', 'browse'))); + if($success) return $this->send(array('result' => 'success', 'message' => zget($this->lang->instance->notices, 'uninstallSuccess'), 'load' => 'table')); return $this->send(array('result' => 'fail', 'message' => zget($this->lang->instance->notices, 'uninstallFail'))); }