* Refactor zanode::createSnapshot.

This commit is contained in:
xieqiyu
2023-12-25 15:00:07 +08:00
parent cb50ce5ada
commit ba930627bd
3 changed files with 15 additions and 19 deletions
+4
View File
@@ -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');
+10 -18
View File
@@ -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();
}
+1 -1
View File
@@ -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;