From ba930627bd63b16572dbeddccb7890b33db281fa Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Mon, 25 Dec 2023 14:59:51 +0800
Subject: [PATCH] * Refactor zanode::createSnapshot.

---
 module/zanode/config/form.php |  4 ++++
 module/zanode/control.php     | 28 ++++++++++------------------
 module/zanode/model.php       |  2 +-
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/module/zanode/config/form.php b/module/zanode/config/form.php
index ba8538f4cf..30ee83790e 100644
--- a/module/zanode/config/form.php
+++ b/module/zanode/config/form.php
@@ -28,3 +28,7 @@ $config->zanode->form->edit['desc']     = array('type' => 'string', 'required' =
 $config->zanode->form->createImage = array();
 $config->zanode->form->createImage['name'] = array('type' => 'string', 'required' => true,  'filter' => 'trim');
 $config->zanode->form->createImage['desc'] = array('type' => 'string', 'required' => false, 'control' => 'editor');
+
+$config->zanode->form->createSnapshot = array();
+$config->zanode->form->createSnapshot['name'] = array('type' => 'string', 'required' => true,  'filter' => 'trim');
+$config->zanode->form->createSnapshot['desc'] = array('type' => 'string', 'required' => false, 'control' => 'editor');
diff --git a/module/zanode/control.php b/module/zanode/control.php
index 80bbcc8653..ba84a7b0d2 100644
--- a/module/zanode/control.php
+++ b/module/zanode/control.php
@@ -250,11 +250,6 @@ class zanode extends control
      */
     public function createImage(int $nodeID = 0)
     {
-        $task        = '';
-        $node        = $this->zanode->getNodeByID($nodeID);
-        $customImage = $this->zanode->getCustomImage($nodeID, 'created,inprogress');
-        if($customImage) $task = $this->zanode->getTaskStatus($node, $customImage->id, 'exportVm');
-
         if($_POST)
         {
             $this->zanode->createImage($nodeID);
@@ -262,6 +257,11 @@ class zanode extends control
             return $this->sendSuccess(array('load' => true));
         }
 
+        $task        = '';
+        $node        = $this->zanode->getNodeByID($nodeID);
+        $customImage = $this->zanode->getCustomImage($nodeID, 'created,inprogress');
+        if($customImage) $task = $this->zanode->getTaskStatus($node, $customImage->id, 'exportVm');
+
         $this->view->task = $task;
         $this->view->node = $node;
         $this->view->rate = isset($task->rate) ? $task->rate : 0;
@@ -272,28 +272,20 @@ class zanode extends control
      * 创建快照。
      * Create snapshot.
      *
-     * @param  int    $zanodeID
+     * @param  int    $nodeID
      * @access public
      * @return void
      */
-    public function createSnapshot($nodeID = 0)
+    public function createSnapshot(int $nodeID = 0)
     {
-        $node = $this->zanode->getNodeByID($nodeID);
-
         if($_POST)
         {
             $this->zanode->createSnapshot($nodeID);
-
-            if(dao::isError())
-            {
-                $response['result']  = 'fail';
-                $response['message'] = dao::getError();
-                return $this->send($response);
-            }
-            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+            if(dao::isError()) return $this->sendError(dao::getError());
+            return $this->sendSuccess(array('load' => true));
         }
 
-        $this->view->node = $node;
+        $this->view->node = $this->zanode->getNodeByID($nodeID);
         $this->display();
     }
 
diff --git a/module/zanode/model.php b/module/zanode/model.php
index 50aeea7bac..3c0263c500 100644
--- a/module/zanode/model.php
+++ b/module/zanode/model.php
@@ -213,7 +213,7 @@ class zanodemodel extends model
      */
     public function createSnapshot($zanodeID = 0)
     {
-        $data = fixer::input('post')->get();
+        $data = form::data()->get();
 
         if(empty($data->name)) dao::$errors['name'] = $this->lang->zanode->imageNameEmpty;
         if(dao::isError()) return false;