mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-23 10:38:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
tom mortensen
2024-01-08 14:26:16 -08:00
committed by GitHub
parent 0fcc246760 7c94cbd169
commit b8b8f43387
7 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix.my.servers/unraid-components/_nuxt/unraid-components.client-905bd884.js → emhttp/plugins/dynamix.my.servers/unraid-components/_nuxt/unraid-components.client-d5e66c30.js
+3 -3
View File
File diff suppressed because one or more lines are too long
emhttp/plugins/dynamix.my.servers/unraid-components/manifest.json
+1 -1
View File
@@ -7,7 +7,7 @@
"css": [
"_nuxt/unraid-components.client-b74ef392.css"
],
"file": "_nuxt/unraid-components.client-905bd884.js",
"file": "_nuxt/unraid-components.client-d5e66c30.js",
"isEntry": true,
"src": ".nuxt/nuxt-custom-elements/entries/unraid-components.client.mjs"
}
emhttp/plugins/dynamix.plugin.manager/post-hooks/post_plugin_checks
+1 -1
View File
@@ -24,7 +24,7 @@ function newurl($url) {
return str_replace($oldURL,$newURL,$url);
}
function searchLink(&$db,$url) {
if ($url) for ($i = 0; $i < count($db); $i++) if (($db[$i]['PluginURL']??'')==$url) return $db[$i]['Support'];
if ($url) for ($i = 0; $i < count($db); $i++) if ( ($db[$i]['PluginURL']??null)==$url) return $db[$i]['Support']??null;
}
$type = $argv[1]??''; // plugin or language
emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
+1 -1
View File
@@ -70,7 +70,7 @@ foreach ($vms as $vm) {
if (($diskcnt = $lv->get_disk_count($res)) > 0) {
$disks = $diskcnt.' / '.$lv->get_disk_capacity($res);
$fstype = $lv->get_disk_fstype($res);
$diskdesc = 'Current physical size: '.$lv->get_disk_capacity($res, true)."\nDefault snapshot type:$fstype";
$diskdesc = 'Current physical size: '.$lv->get_disk_capacity($res, true)."\nDefault snapshot type: $fstype";
}
$arrValidDiskBuses = getValidDiskBuses();
$vmrcport = $lv->domain_get_vnc_port($res);
emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+2 -1
View File
@@ -200,7 +200,8 @@
$this->set_folder_nodatacow($path_parts['dirname']);
$strImgPath = $strImgFolder;
$strExt = ($disk['driver'] == 'raw') ? 'img' : $disk['driver'];
$strImgPath = $path_parts['dirname'] . '/vdisk' . $diskid . '.' . $strExt;
}
emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+2 -4
View File
@@ -1278,16 +1278,14 @@ private static $encoding = 'UTF-8';
!file_exists($domain_cfg['DOMAINDIR']) ||
!is_file($strPath) ||
strpos($domain_cfg['DOMAINDIR'], dirname(dirname($strPath))) === false ||
basename($strPath) != 'vdisk'.($i+1).'.img') {
$default_option = 'manual';
basename($strPath) != 'vdisk'.($i+1).'.img' || basename($strPath) != 'vdisk'.($i+1).'.qcow2') {
if (($disk['type'] == "qcow2" && (basename($strPath) == 'vdisk'.($i+1).'.qcow2')) || ($disk['type'] == "raw" && (basename($strPath) == 'vdisk'.($i+1).'.img'))) $default_option = "auto"; else $default_option = 'manual';
}
$arrDisks[] = [
'new' => $strPath,
'size' => '',
'driver' => $disk['type'],
'driver' => 'raw',
'dev' => $disk['device'],
'bus' => $disk['bus'],
'boot' => $disk['boot order'],
emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+15 -6
View File
@@ -702,11 +702,12 @@
if (!empty($arrDisk['new'])) {
if (strpos($domain_cfg['DOMAINDIR'], dirname(dirname($arrDisk['new']))) === false ||
basename(dirname($arrDisk['new'])) != $arrConfig['domain']['name'] ||
basename($arrDisk['new']) != 'vdisk'.($i+1).'.img') {
basename(dirname($arrDisk['new'])) != $arrConfig['domain']['name'] || (
basename($arrDisk['new']) != 'vdisk'.($i+1).'.img') && basename($arrDisk['new']) != 'vdisk'.($i+1).'.qcow2') {
if ($arrDisk['driver'] == "qcow2" && (basename($arrDisk['new']) == 'vdisk'.($i+1).'.qcow2')) $default_option = "auto"; else
$default_option = 'manual';
}
if (file_exists(dirname(dirname($arrDisk['new'])).'/'.$arrConfig['domain']['name'].'/vdisk'.($i+1).'.img')) {
if (file_exists(dirname(dirname($arrDisk['new'])).'/'.$arrConfig['domain']['name'].'/vdisk'.($i+1).'.img') || file_exists(dirname(dirname($arrDisk['new'])).'/'.$arrConfig['domain']['name'].'/vdisk'.($i+1).'.qcow2')) {
// hide all the disks because the auto disk already has been created
$boolShowAllDisks = false;
}
@@ -777,7 +778,7 @@
<tr class="advanced disk_file_options">
<td>_(vDisk Type)_:</td>
<td>
<select name="disk[<?=$i?>][driver]" class="narrow" title="_(type of storage image)_">
<select name="disk[<?=$i?>][driver]" class="disk_driver narrow" title="_(type of storage image)_">
<?mk_dropdown_options($arrValidDiskDrivers, $arrDisk['driver']);?>
</select>
</td>
@@ -921,7 +922,7 @@
<tr class="advanced disk_file_options">
<td>_(vDisk Type)_:</td>
<td>
<select name="disk[{{INDEX}}][driver]" class="narrow" title="_(type of storage image)_">
<select name="disk[{{INDEX}}][driver]" class="disk_driver narrow" title="_(type of storage image)_">
<?mk_dropdown_options($arrValidDiskDrivers, '');?>
</select>
</td>
@@ -1884,6 +1885,10 @@ $(function() {
var $disk_input = $table.find('.disk');
var $disk_preview = $table.find('.disk_preview');
var $disk_serial = $table.find('.disk_serial');
var $disk_driver = $table.find('.disk_driver').val();
var $disk_ext = "img";
if ($disk_driver == "raw") $disk_ext = "img";
else if(disk_select != 'manual') $disk_ext = $disk_driver;
if (disk_select == 'manual') {
@@ -1912,7 +1917,7 @@ $(function() {
} else if (disk_select !== '') {
// Auto disk
var auto_disk_path = domaindir + '/vdisk' + (index+1) + '.img';
var auto_disk_path = domaindir + '/vdisk' + (index+1) + '.' + $disk_ext;
$disk_preview.html(auto_disk_path);
$disk_input.fadeOut('fast', function() {
$disk_preview.fadeIn('fast');
@@ -2044,6 +2049,10 @@ $(function() {
regenerateDiskPreview($(this).closest('table').data('index'));
});
$("#vmform").on("change", ".disk_driver", function changeDiskSelectEvent() {
regenerateDiskPreview($(this).closest('table').data('index'));
});
$("#vmform").on("input change", ".disk", function changeDiskEvent() {
var $input = $(this);
var config = $input.data();