Merge pull request #1329 from bergware/master

Network settings: fix bug in description field
This commit is contained in:
tom mortensen
2023-05-06 08:11:57 -07:00
committed by GitHub
3 changed files with 6 additions and 7 deletions

View File

@@ -607,9 +607,7 @@ disable these services while mover is running.
:share_edit_copy_on_write_help:
Set to **No** to cause the *btrfs* NOCOW (No Copy-on-Write) attribute to be set on the share directory
when created on a device formatted with *btrfs* file system. Once set, newly created files and
subdirectories on the device will inherit the NOCOW attribute. We recommend this setting for shares
used to store vdisk images, including the Docker loopback image file. This setting has no effect
on non-btrfs file systems.
subdirectories on the device will inherit the NOCOW attribute. This setting has no effect on non-btrfs file systems.
Set to **Auto** for normal operation, meaning COW **will** be in effect on devices formatted with *btrfs*.
:end

View File

@@ -94,6 +94,7 @@ Array.prototype.same = function(){return this.sort().filter(function(v,i,o){retu
function prepareSettings(form) {
var metrics = [];
var metrics6 = [];
if ($(form).find('input[name="#arg[1]"]').val()=='none') return true;
$(form).find('input[name^="METRIC:"]').each(function(){if($(this).val()>0) metrics.push($(this).val());});
$(form).find('input[name^="METRIC6:"]').each(function(){if($(this).val()>0) metrics6.push($(this).val());});
if (metrics.same() || metrics6.same()) {

View File

@@ -84,7 +84,7 @@ $(function() {
setTimeout(portcheck_ethX,Number('ethX'.substr(3))*1000);
});
</script>
<form markdown="1" name="ethX_settings" method="POST" action="/update.php" target="progressFrame" onchange="exitCode(this,false)" onsubmit="return prepareSettings(this)">
<form markdown="1" name="ethX_settings" method="POST" action="/update.php" target="progressFrame" onchange="doRun(this)" onsubmit="return prepareSettings(this)">
<input type="hidden" name="#file" value="<?=$ini?>">
<input type="hidden" name="#include" value="/webGui/include/update.ethernet.php">
<input type="hidden" name="#section" value="ethX">
@@ -98,7 +98,7 @@ $(function() {
_(Interface description)_:
: <span class="status vshift"><i id="tag-ethX" class="fa fa-fw fa-chevron-down" style="cursor:pointer" onclick="viewToggle('ethX')"></i></span>
<?if (!$more):?>
<input type="text" name="DESCRIPTION:0" maxlength="80" value="<?=htmlspecialchars(_var($ethX,"DESCRIPTION:0"))?>" onchange="exitCode(this.form,true)">
<input type="text" name="DESCRIPTION:0" maxlength="80" value="<?=htmlspecialchars(_var($ethX,"DESCRIPTION:0"))?>" oninput="noRun(this.form)">
<?else:?>
<span class="<?=$class?>"><?=$reason?></span>
<?endif;?>
@@ -268,7 +268,7 @@ _(Enable VLANs)_:
<div markdown="1" id="index-ethX-<?=$i?>" class="access-ethX shade-<?=$display['theme']?>" style="display:none">
_(Interface description)_:
: <span class="status vshift"><i id="tag-ethX-<?=$i?>" class="fa fa-fw fa-chevron-down" style="cursor:pointer" onclick="viewToggle('ethX','<?=$i?>')"></i></span>
<input type="text" name="DESCRIPTION:<?=$i?>" maxlength="80" value="<?=htmlspecialchars(_var($ethX,"DESCRIPTION:$i"))?>" onchange="exitCode(this.form,true)">
<input type="text" name="DESCRIPTION:<?=$i?>" maxlength="80" value="<?=htmlspecialchars(_var($ethX,"DESCRIPTION:$i"))?>" oninput="noRun(this.form)">
:eth_interface_description_help:
@@ -377,7 +377,7 @@ _(IPv6 privacy extensions)_:
<div markdown="1" id="index-ethX-INDEX" class="access-ethX shade-<?=$display['theme']?>">
_(Interface description)_:
: <span class="status vshift"><i id="tag-ethX-INDEX" class="fa fa-fw fa-chevron-up" style="cursor:pointer" onclick="viewToggle('ethX','INDEX')"></i></span>
<input type="text" name="DESCRIPTION:INDEX" maxlength="80" value="<?=htmlspecialchars(_var($ethX,"DESCRIPTION:INDEX"))?>" onchange="exitCode(this.form,true)">
<input type="text" name="DESCRIPTION:INDEX" maxlength="80" value="<?=htmlspecialchars(_var($ethX,"DESCRIPTION:INDEX"))?>" oninput="noRun(this.form)">
<div markdown="1" id="view-ethX-INDEX">
_(VLAN number)_: