Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Refactor zanode::createImage.

Browse Source
This commit is contained in:
xieqiyu
2023-12-25 14:39:29 +08:00
parent a4912d5781
commit d104fcaed9
4 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zanode/config/form.php
+4 -1
View File
@@ -17,7 +17,6 @@ $config->zanode->form->create['osNamePre'] = array('type' => 'string', 'requ
$config->zanode->form->create['osNamePhysics'] = array('type' => 'string', 'required' => false);
$config->zanode->form->create['desc'] = array('type' => 'string', 'required' => false, 'control' => 'editor');
$config->zanode->form->edit = array();
$config->zanode->form->edit['name'] = array('type' => 'string', 'required' => false, 'filter' => 'trim');
$config->zanode->form->edit['extranet'] = array('type' => 'string', 'required' => false, 'filter' => 'trim');
@@ -25,3 +24,7 @@ $config->zanode->form->edit['memory'] = array('type' => 'float', 'required' =
$config->zanode->form->edit['diskSize'] = array('type' => 'float', 'required' => false);
$config->zanode->form->edit['osName'] = array('type' => 'string', 'required' => false);
$config->zanode->form->edit['desc'] = array('type' => 'string', 'required' => false, 'control' => 'editor');
$config->zanode->form->createImage = array();
$config->zanode->form->createImage['name'] = array('type' => 'string', 'required' => false, 'filter' => 'trim');
$config->zanode->form->createImage['desc'] = array('type' => 'string', 'required' => false, 'control' => 'editor');
module/zanode/control.php
+5 -10
View File
@@ -241,13 +241,14 @@ class zanode extends control
}
/**
* 创建快照。
* Create custom image.
*
* @param int $nodeID
* @access public
* @return void
*/
public function createImage($nodeID = 0)
public function createImage(int $nodeID = 0)
{
$task = '';
$node = $this->zanode->getNodeByID($nodeID);
@@ -257,19 +258,13 @@ class zanode extends control
if($_POST)
{
$this->zanode->createImage($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' => 'reload'));
if(dao::isError()) return $this->sendError(dao::getError());
return $this->sendSuccess(array('load' => true));
}
$this->view->task = $task;
$this->view->node = $node;
$this->view->rate = !empty($task->rate) ? $task->rate : 0;
$this->view->rate = isset($task->rate) ? $task->rate : 0;
$this->display();
}
module/zanode/model.php
+1 -2
View File
@@ -160,7 +160,7 @@ class zanodemodel extends model
*/
public function createImage($zanodeID = 0)
{
$data = fixer::input('post')->get();
$data = form::data()->get();
if(empty($data->name)) dao::$errors['message'][] = $this->lang->zanode->imageNameEmpty;
if(dao::isError()) return false;
@@ -194,7 +194,6 @@ class zanodemodel extends model
$result = json_decode(commonModel::http($agnetUrl . static::KVM_EXPORT_PATH, json_encode($param,JSON_NUMERIC_CHECK), null, array("Authorization:$node->tokenSN"), 'data', 'POST', 10));
if(!empty($result) and $result->code == 'success')
{
$this->dao->update(TABLE_ZAHOST)->set('status')->eq(static::STATUS_CREATING_IMG)->where('id')->eq($node->id)->exec();
module/zanode/ui/createimage.html.php
-1
View File
@@ -73,4 +73,3 @@ if($task) modalHeader(set::title($lang->zanode->createImage));
);
render();