mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-22 01:19:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove test code and fix menu if vm not running and manual port set.

Browse Source
This commit is contained in:
SimonFair
2022-08-13 18:22:04 +01:00
parent 717ee6c647
commit f029db2da3
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/dynamix.vm.manager/javascript/vmmanager.js
View File

@@ -19,7 +19,7 @@ function addVMContext(name, uuid, template, state, vmrcurl,vmrcprotocol , log){
var path = location.pathname;
var x = path.indexOf("?");
if (x!=-1) path = path.substring(0,x);
if (vmrcurl !== "") {
if (vmrcurl !== "" && state == "running") {
var vmrctext=_("VM Console") + "(" + vmrcprotocol + ")" ;
opts.push({text:vmrctext, icon:"fa-desktop", action:function(e) {
e.preventDefault();

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

@@ -875,12 +875,11 @@
</tr>
<?if ($i == 0) {
$hiddenport = $hiddenwsport = "" ;
$disabled = "" ;
$hiddenport = $hiddenwsport = "hidden" ;
if ($arrGPU['autoport'] == "no"){
if ($arrGPU['protocol'] == "vnc") $hiddenport = $hiddenwsport = "" ;
if ($arrGPU['protocol'] == "spice") $hiddenport = "" ;
}
if ($arrGPU['protocol'] == "vnc") $hiddenport = $hiddenwsport = "" ;
if ($arrGPU['protocol'] == "spice") $hiddenport = "" ;
}
?>
<tr class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced protocol">
<td>_(VM Console Protocol)_:</td>
@@ -889,24 +888,24 @@
<?mk_dropdown_options($arrValidProtocols, $arrGPU['protocol']);?>
</select>
</td>
</tr>
</tr>
<tr id="autoportline" name="autoportline" class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced autoportline">
<td>_(VM Console AutoPort)_:</td>
<td>_(VM Console AutoPort)_:</td>
<td>
<select <?=$disabled?> id="autoport" name="gpu[<?=$i?>][autoport]" class="narrow" onchange="AutoportChange(this)">
<?
<select <?=$disabled?> id="autoport" name="gpu[<?=$i?>][autoport]" class="narrow" onchange="AutoportChange(this)">
<?
echo mk_option($arrGPU['autoport'], 'yes', _('Yes'));
echo mk_option($arrGPU['autoport'], 'no', _('No'));
?>
</select>
<span id="Porttext" <?=$disbaled?> <?=$hiddenport?>>_(VM Console Port)_:</span>
<span id="Porttext" <?=$disbaled?> <?=$hiddenport?>>_(VM Console Port)_:</span>
<input type="number" size="5" maxlength="5" id="port" name="gpu[<?=$i?>][port]" title="_(port for virtual console)_" value="<?=$arrGPU['port']?>" <?=$hiddenport?> <?=$disabled?> >
<input type="number" size="5" maxlength="5" id="port" name="gpu[<?=$i?>][port]" title="_(port for virtual console)_" value="<?=$arrGPU['port']?>" <?=$hiddenport?> >
<span id="WSPorttext" <?=$disbaled?> <?=$hiddenwsport?>>_(VM Console WS Port)_:</span>
<span id="WSPorttext" <?=$disbaled?> <?=$hiddenwsport?>>_(VM Console WS Port)_:</span>
<input type="number" size="5" maxlength="5" id="wsport" name="gpu[<?=$i?>][wsport]" title="_(wsport for virtual console)_" value="<?=$arrGPU['wsport']?>" <?=$hiddenwsport?> <?=$disabled?> >
<input type="number" size="5" maxlength="5" id="wsport" name="gpu[<?=$i?>][wsport]" title="_(wsport for virtual console)_" value="<?=$arrGPU['wsport']?>" <?=$hiddenwsport?> >
</td>
</tr>