mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-20 20:02:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make all VM template forms consistent

Browse Source
This commit is contained in:
bergware
2018-08-14 10:13:35 +02:00
parent 3330cc855e
commit 07fffb00f1
4 changed files with 52 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/dynamix.vm.manager/templates/Custom.form.php
View File

@@ -218,9 +218,9 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
$reply = ['success' => true];
} else {
// Failure -- try to restore existing domain
$reply = ['error' => $lv->get_last_error()];
$old = $lv->domain_define($strXML);
if ($old) $lv->domain_set_autostart($old, $oldAutoStart);
$reply = ['error' => $lv->get_last_error()];
}
echo json_encode($reply);
exit;
@@ -1130,7 +1130,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<td></td>
<td>
<? if (!$boolRunning) { ?>
<? if (!empty($strXML)) { ?>
<? if ($strXML) { ?>
<input type="hidden" name="updatevm" value="1" />
<input type="button" value="Update" busyvalue="Updating..." readyvalue="Update" id="btnSubmit" />
<? } else { ?>

5
plugins/dynamix.vm.manager/templates/LibreELEC.form.php
View File

@@ -378,9 +378,9 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
$reply = ['success' => true];
} else {
// Failure -- try to restore existing domain
$reply = ['error' => $lv->get_last_error()];
$old = $lv->domain_define($strXML);
if ($old) $lv->domain_set_autostart($old, $oldAutoStart);
$reply = ['error' => $lv->get_last_error()];
}
echo json_encode($reply);
exit;
@@ -973,7 +973,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<td></td>
<td>
<? if (!$boolRunning) { ?>
<? if (!empty($strXML)) { ?>
<? if ($strXML) { ?>
<input type="hidden" name="updatevm" value="1" />
<input type="button" value="Update" busyvalue="Updating..." readyvalue="Update" id="btnSubmit" />
<? } else { ?>
@@ -983,7 +983,6 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<input type="button" value="Create" busyvalue="Creating..." readyvalue="Create" id="btnSubmit" />
<? } ?>
<input type="button" value="Cancel" id="btnCancel" />
<span><i class="fa fa-warning icon warning"></i> Manual XML edits may be lost if you later edit with the Form editor.</span>
<? } else { ?>
<input type="button" value="Back" id="btnCancel" />
<? } ?>

5
plugins/dynamix.vm.manager/templates/OpenELEC.form.php
View File

@@ -380,9 +380,9 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
$reply = ['success' => true];
} else {
// Failure -- try to restore existing domain
$reply = ['error' => $lv->get_last_error()];
$old = $lv->domain_define($strXML);
if ($old) $lv->domain_set_autostart($old, $oldAutoStart);
$reply = ['error' => $lv->get_last_error()];
}
echo json_encode($reply);
exit;
@@ -975,7 +975,7 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<td></td>
<td>
<? if (!$boolRunning) { ?>
<? if (!empty($strXML)) { ?>
<? if ($strXML) { ?>
<input type="hidden" name="updatevm" value="1" />
<input type="button" value="Update" busyvalue="Updating..." readyvalue="Update" id="btnSubmit" />
<? } else { ?>
@@ -985,7 +985,6 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
<input type="button" value="Create" busyvalue="Creating..." readyvalue="Create" id="btnSubmit" />
<? } ?>
<input type="button" value="Cancel" id="btnCancel" />
<span><i class="fa fa-warning icon warning"></i> Manual XML edits may be lost if you later edit with the Form editor.</span>
<? } else { ?>
<input type="button" value="Back" id="btnCancel" />
<? } ?>

103
plugins/dynamix.vm.manager/templates/XML_Expert.form.php
View File

@@ -1,6 +1,7 @@
<?PHP
/* Copyright 2005-2017, Lime Technology
* Copyright 2015-2017, Derek Macias, Eric Schultz, Jon Panozzo.
/* Copyright 2005-2018, Lime Technology
* Copyright 2015-2018, Derek Macias, Eric Schultz, Jon Panozzo.
* Copyright 2012-2018, Bergware International.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2,
@@ -15,71 +16,60 @@
require_once "$docroot/webGui/include/Helpers.php";
require_once "$docroot/plugins/dynamix.vm.manager/include/libvirt_helpers.php";
$strXML = '';
$strUUID = '';
$boolRunning = false;
$hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaration
// If we are editing a existing VM load it's existing configuration details
if (!empty($_GET['uuid'])) {
$strUUID = $_GET['uuid'];
$res = $lv->domain_get_name_by_uuid($strUUID);
$dom = $lv->domain_get_info($res);
$strXML = $lv->domain_get_xml($res);
$boolRunning = ($lv->domain_state_translate($dom['state']) == 'running');
}
if (array_key_exists('createvm', $_POST)) {
$tmp = $lv->domain_define($_POST['xmldesc'], !empty($config['domain']['startnow']));
if (!$tmp){
$arrResponse = ['error' => $lv->get_last_error()];
// create new VM
if ($_POST['createvm']) {
$new = $lv->domain_define($_POST['xmldesc'], $_POST['domain']['startnow']==1);
if ($new){
$lv->domain_set_autostart($new, $_POST['domain']['autostart']==1);
$reply = ['success' => true];
} else {
$lv->domain_set_autostart($tmp, $_POST['domain']['autostart'] == 1);
$arrResponse = ['success' => true];
$reply = ['error' => $lv->get_last_error()];
}
echo json_encode($arrResponse);
echo json_encode($reply);
exit;
}
if (array_key_exists('updatevm', $_POST)) {
// Backup xml for existing domain in ram
$strOldXML = '';
$boolOldAutoStart = false;
$dom = $lv->domain_get_domain_by_uuid($_POST['domain']['uuid']);
if ($dom) {
$strOldXML = $lv->domain_get_xml($dom);
$boolOldAutoStart = $lv->domain_get_autostart($dom);
}
if ($_POST['updatevm']) {
$uuid = $_POST['domain']['uuid'];
$dom = $lv->domain_get_domain_by_uuid($uuid);
$oldAutoStart = $lv->domain_get_autostart($dom)==1;
$newAutoStart = $_POST['domain']['autostart']==1;
$strXML = $lv->domain_get_xml($dom);
// Remove existing domain
$lv->nvram_backup($_POST['domain']['uuid']);
// delete and create the VM
$lv->nvram_backup($uuid);
$lv->domain_undefine($dom);
$lv->nvram_restore($_POST['domain']['uuid']);
// Save new domain
$tmp = $lv->domain_define($_POST['xmldesc']);
if (!$tmp){
$strLastError = $lv->get_last_error();
// Failure -- try to restore existing domain
$tmp = $lv->domain_define($strOldXML);
if ($tmp) $lv->domain_set_autostart($tmp, $boolOldAutoStart);
$arrResponse = ['error' => $strLastError];
$lv->nvram_restore($uuid);
$new = $lv->domain_define($_POST['xmldesc']);
if ($new) {
$lv->domain_set_autostart($new, $newAutoStart);
$reply = ['success' => true];
} else {
$lv->domain_set_autostart($tmp, $_POST['domain']['autostart'] == 1);
$arrResponse = ['success' => true];
// Failure -- try to restore existing domain
$reply = ['error' => $lv->get_last_error()];
$old = $lv->domain_define($strXML);
if ($old) $lv->domain_set_autostart($old, $oldAutoStart);
}
echo json_encode($arrResponse);
echo json_encode($reply);
exit;
}
if ($_GET['uuid']) {
// edit an existing VM
$uuid = $_GET['uuid'];
$dom = $lv->domain_get_domain_by_uuid($uuid);
$boolRunning = $lv->domain_get_state($dom)=='running';
$strXML = $lv->domain_get_xml($dom);
} else {
// edit new VM
$uuid = '';
$boolRunning = false;
$strXML = '';
}
?>
<link rel="stylesheet" href="/plugins/dynamix.vm.manager/scripts/codemirror/lib/codemirror.css">
<link rel="stylesheet" href="/plugins/dynamix.vm.manager/scripts/codemirror/addon/hint/show-hint.css">
<style type="text/css">
@@ -87,12 +77,12 @@
.CodeMirror pre.CodeMirror-placeholder { color: #999; }
</style>
<input type="hidden" name="domain[uuid]" value="<?=htmlspecialchars($strUUID)?>">
<input type="hidden" name="domain[uuid]" value="<?=htmlspecialchars($uuid)?>">
<textarea id="addcode" name="xmldesc" placeholder="Copy &amp; Paste Domain XML Configuration Here." autofocus><?= htmlspecialchars($strXML); ?></textarea>
<textarea id="addcode" name="xmldesc" placeholder="Copy &amp; Paste Domain XML Configuration Here." autofocus><?=htmlspecialchars($hdrXML).htmlspecialchars($strXML)?></textarea>
<? if (!$boolRunning) { ?>
<? if (!empty($strXML)) { ?>
<? if ($strXML) { ?>
<input type="hidden" name="updatevm" value="1" />
<input type="button" value="Update" busyvalue="Updating..." readyvalue="Update" id="btnSubmit" />
<? } else { ?>
@@ -102,7 +92,6 @@
<input type="button" value="Create" busyvalue="Creating..." readyvalue="Create" id="btnSubmit" />
<? } ?>
<input type="button" value="Cancel" id="btnCancel" />
<span><i class="fa fa-warning icon warning"></i> Manual XML edits may be lost if you later edit with the GUI editor.</span>
<? } else { ?>
<input type="button" value="Done" id="btnCancel" />
<? } ?>