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

Networking: fix default gateway selection

Browse Source
This commit is contained in:
bergware
2025-06-09 10:42:39 +02:00
parent 691bd0f1f1
commit 8f054cea03
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
emhttp/plugins/dynamix/Eth0.page
View File

@@ -209,10 +209,9 @@ function prepareSettings(form) {
});
$(form).find('select[name^="USE_DHCP:"]').each(function() {
var i = $(this).prop('name').split(':')[1];
var x = (port == 'eth0') ? i + 1 : i;
var protocol = $(form).find('select[name="PROTOCOL:'+i+'"]').val() || 'ipv4';
var gw4 = $(form).find('input[name="USE_GW4:'+i+'"]').prop('checked');
if (!gw4) $(form).find('input[name="METRIC:'+x+'"]').val('0');
if (gw4 === false) $(form).find('input[name="METRIC:'+i+'"]').val('0');
if (protocol != 'ipv6' && $(this).val() != 'no') {
$(form).find('input[name="IPADDR:'+i+'"]').val('');
$(form).find('input[name="GATEWAY:'+i+'"]').val('');
@@ -220,10 +219,9 @@ function prepareSettings(form) {
});
$(form).find('select[name^="USE_DHCP6:"]').each(function() {
var i = $(this).prop('name').split(':')[1];
var x = (port == 'eth0') ? i + 1 : i;
var protocol = $(form).find('select[name="PROTOCOL:'+i+'"]').val() || 'ipv4';
var gw6 = $(form).find('input[name="USE_GW6:'+i+'"]').prop('checked');
if (!gw6) $(form).find('input[name="METRIC6:'+x+'"]').val('0');
if (gw6 === false) $(form).find('input[name="METRIC6:'+i+'"]').val('0');
if (protocol != 'ipv4' && $(this).val() != 'no') {
$(form).find('input[name="IPADDR6:'+i+'"]').val('');
$(form).find('input[name="GATEWAY6:'+i+'"]').val('');
@@ -828,7 +826,7 @@ _(IPv4 address assignment)_:
<?=mk_option(_var($eth0, "USE_DHCP:$i"), 'no', _('Static'))?>
<?=mk_option(_var($eth0, "USE_DHCP:$i"), '', _('None'))?>
</select>
<span class="gw4-eth0-<?=$i?> hide"><input type="checkbox" name="USE_GW4:<?=$i?>" onchange="selectGW(this.form,4,<?=$i?>,'slow')" <?=_var($eth0,"METRIC:$i") == 0 ? '' : 'checked'?>><?=$enable?></span>
<span class="gw4-eth0-<?=$i?> hide"><input type="checkbox" name="USE_GW4:<?=$i?>" onchange="selectGW(this.form,4,<?=$i?>,'slow')" <?=(_var($eth0,"METRIC:$i") == 0 || _var($eth0,"GATEWAY:$i") == '') ? '' : 'checked'?>><?=$enable?></span>
:eth_ipv4_address_assignment_help:
@@ -859,7 +857,7 @@ _(IPv6 address assignment)_:
<?=mk_option(_var($eth0, "USE_DHCP6:$i"), '', _('None'))?>
<?endif;?>
</select>
<span class="gw6-eth0-<?=$i?> hide"><input type="checkbox" name="USE_GW6:<?=$i?>" onchange="selectGW(this.form,6,<?=$i?>,'slow')" <?=_var($eth0,"METRIC6:$i") == 0 ? '' : 'checked'?>><?=$enable?></span>
<span class="gw6-eth0-<?=$i?> hide"><input type="checkbox" name="USE_GW6:<?=$i?>" onchange="selectGW(this.form,6,<?=$i?>,'slow')" <?=(_var($eth0,"METRIC6:$i") == 0 || _var($eth0,"GATEWAY6:$i") == '') ? '' : 'checked'?>><?=$enable?></span>
:eth_ipv6_address_assignment_help:

8
emhttp/plugins/dynamix/EthX.page
View File

@@ -173,7 +173,7 @@ _(IPv4 address assignment)_:
<?=mk_option(_var($ethX,"USE_DHCP:0"), 'no', _('Static'))?>
<?=mk_option(_var($ethX,"USE_DHCP:0"), '', _('None'))?>
</select>
<span class="gw4-ethX-0 hide"><input type="checkbox" name="USE_GW4:0" onchange="selectGW(this.form,4,0,'slow')" <?=_var($ethX,"METRIC:0") == 0 ? '' : 'checked'?>><?=$enable?></span>
<span class="gw4-ethX-0 hide"><input type="checkbox" name="USE_GW4:0" onchange="selectGW(this.form,4,0,'slow')" <?=(_var($ethX,"METRIC:0") == 0 || _var($ethX,"GATEWAY:$i") == '') ? '' : 'checked'?>><?=$enable?></span>
:eth_ipv4_address_assignment_help:
@@ -202,7 +202,7 @@ _(IPv6 address assignment)_:
<?=mk_option(_var($ethX,"USE_DHCP6:0"), 'no', _('Static'))?>
<?=mk_option(_var($ethX,"USE_DHCP6:0"), '', _('None'))?>
</select>
<span class="gw6-ethX-0 hide"><input type="checkbox" name="USE_GW6:0" onchange="selectGW(this.form,6,0,'slow')" <?=_var($ethX,"METRIC6:0") == 0 ? '' : 'checked'?>><?=$enable?></span>
<span class="gw6-ethX-0 hide"><input type="checkbox" name="USE_GW6:0" onchange="selectGW(this.form,6,0,'slow')" <?=(_var($ethX,"METRIC6:0") == 0 || _var($ethX,"GATEWAY6:$i") == '') ? '' : 'checked'?>><?=$enable?></span>
:eth_ipv6_address_assignment_help:
@@ -282,7 +282,7 @@ _(IPv4 address assignment)_:
<?=mk_option(_var($ethX,"USE_DHCP:$i"), 'no', _('Static'))?>
<?=mk_option(_var($ethX,"USE_DHCP:$i"), '', _('None'))?>
</select>
<span class="gw4-ethX-<?=$i?> hide"><input type="checkbox" name="USE_GW4:<?=$i?>" onchange="selectGW(this.form,4,<?=$i?>,'slow')" <?=_var($ethX,"METRIC:$i") == 0 ? '' : 'checked'?>><?=$enable?></span>
<span class="gw4-ethX-<?=$i?> hide"><input type="checkbox" name="USE_GW4:<?=$i?>" onchange="selectGW(this.form,4,<?=$i?>,'slow')" <?=(_var($ethX,"METRIC:$i") == 0 || _var($ethX,"GATEWAY:$i") == '') ? '' : 'checked'?>><?=$enable?></span>
:eth_ipv4_address_assignment_help:
@@ -311,7 +311,7 @@ _(IPv6 address assignment)_:
<?=mk_option(_var($ethX,"USE_DHCP6:$i"), 'no', _('Static'))?>
<?=mk_option(_var($ethX,"USE_DHCP6:$i"), '', _('None'))?>
</select>
<span class="gw6-ethX-<?=$i?> hide"><input type="checkbox" name="USE_GW6:<?=$i?>" onchange="selectGW(this.form,6,<?=$i?>,'slow')" <?=_var($ethX,"METRIC6:$i") == 0 ? '' : 'checked'?>><?=$enable?></span>
<span class="gw6-ethX-<?=$i?> hide"><input type="checkbox" name="USE_GW6:<?=$i?>" onchange="selectGW(this.form,6,<?=$i?>,'slow')" <?=(_var($ethX,"METRIC6:$i") == 0 || _var($ethX,"GATEWAY6:$i") == '') ? '' : 'checked'?>><?=$enable?></span>
:eth_ipv6_address_assignment_help: