From 39c75d51ce94dfd22b04872c2e3b667010fbf3e0 Mon Sep 17 00:00:00 2001 From: mazhiyuan Date: Tue, 19 Aug 2025 13:22:36 +0800 Subject: [PATCH 1/3] * [bug#61890,done,3h] fix cne->getBackupStatus param instance uninstantiated error --- module/system/control.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/system/control.php b/module/system/control.php index 2948996240..c97d5b4280 100644 --- a/module/system/control.php +++ b/module/system/control.php @@ -362,7 +362,9 @@ class system extends control $this->loadModel('cne'); if(strpos($backupName, '_') !== false) $backupName = str_replace('_', '-', $backupName); - $result = $this->cne->getBackupStatus($this->config->instance->zentaopaas, $backupName); + $this->loadModel('instance'); + $instance = $this->config->instance->zentaopaas; + $result = $this->cne->getBackupStatus($instance, $backupName); if($result && $result->code == 200) { $status = strtolower($result->data->status); From 76a0fa6d7ba3f6baec1a193e26ca2abfe92d7f46 Mon Sep 17 00:00:00 2001 From: mazhiyuan Date: Tue, 19 Aug 2025 15:47:44 +0800 Subject: [PATCH 2/3] * [bug#61890,done,3h] Style formatting. --- module/system/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/system/control.php b/module/system/control.php index c97d5b4280..e7a29a9063 100644 --- a/module/system/control.php +++ b/module/system/control.php @@ -364,7 +364,7 @@ class system extends control if(strpos($backupName, '_') !== false) $backupName = str_replace('_', '-', $backupName); $this->loadModel('instance'); $instance = $this->config->instance->zentaopaas; - $result = $this->cne->getBackupStatus($instance, $backupName); + $result = $this->cne->getBackupStatus($instance, $backupName); if($result && $result->code == 200) { $status = strtolower($result->data->status); From cdb34ee36eef102498cdbf7fbde0337fe14b048d Mon Sep 17 00:00:00 2001 From: mazhiyuan Date: Tue, 19 Aug 2025 17:04:38 +0800 Subject: [PATCH 3/3] * [bug#61890,done,3h] Use recommended usage. --- module/system/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/system/control.php b/module/system/control.php index e7a29a9063..fa4c4aa0c8 100644 --- a/module/system/control.php +++ b/module/system/control.php @@ -362,7 +362,7 @@ class system extends control $this->loadModel('cne'); if(strpos($backupName, '_') !== false) $backupName = str_replace('_', '-', $backupName); - $this->loadModel('instance'); + $this->app->loadConfig('instance'); $instance = $this->config->instance->zentaopaas; $result = $this->cne->getBackupStatus($instance, $backupName); if($result && $result->code == 200)