diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f832ee..66a0de5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,20 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [1.4.1](https://github.com/rdkcentral/webui/compare/1.4.0...1.4.1) + +- RDKB-62740: Disable 320MHz for 11ax mode ion 6GHz [`#83`](https://github.com/rdkcentral/webui/pull/83) +- RDKBDEV-3296: Xfinity Connection status page returns error 404 Not Found [`#49`](https://github.com/rdkcentral/webui/pull/49) +- RDKB-62532: Removing 400ns Guard Interval for 11ax/be for WiFi standards [`#77`](https://github.com/rdkcentral/webui/pull/77) +- Merge tag '1.4.0' into develop [`b6ddf1f`](https://github.com/rdkcentral/webui/commit/b6ddf1f3ffef809004a5cd547da37452c1c8209c) + #### [1.4.0](https://github.com/rdkcentral/webui/compare/1.3.0...1.4.0) +> 4 December 2025 + - RDKB-61349: [SECVULN] Issuer and audience validation missing [`#65`](https://github.com/rdkcentral/webui/pull/65) - XER10-1896: Adding regex to validate client hostname [`#76`](https://github.com/rdkcentral/webui/pull/76) +- Add changelog for release 1.4.0 [`cc2ec44`](https://github.com/rdkcentral/webui/commit/cc2ec44093988f46df5ffc8f23c5d65891d489e0) - Merge tag '1.3.0' into develop [`1547fb9`](https://github.com/rdkcentral/webui/commit/1547fb9941bcb1c50feb2cb83a36afa0c47eda8f) #### [1.3.0](https://github.com/rdkcentral/webui/compare/1.2.1...1.3.0) diff --git a/source/Styles/xb3/jst/connection_status.jst b/source/Styles/xb3/jst/connection_status.jst index 7142591..2eba34b 100644 --- a/source/Styles/xb3/jst/connection_status.jst +++ b/source/Styles/xb3/jst/connection_status.jst @@ -419,8 +419,10 @@ if(($allowEthWan=="true") || ($autoWanEnable=="true")) { echo('Active Ethernet WAN'); }else if(strtolower($selectedOperationalMode)=="docsis"){ echo('Active Docsis WAN'); - }else{ + }else if($selectedOperationalMode == "auto"){ echo('Active Auto WAN'); + }else{ + echo('Unknown WAN'); } }else{ $wan_enable= getStr("Device.Ethernet.X_RDKCENTRAL-COM_WAN.Enabled"); diff --git a/source/Styles/xb3/jst/includes/utility.jst b/source/Styles/xb3/jst/includes/utility.jst index ac6dc74..4a9c97a 100644 --- a/source/Styles/xb3/jst/includes/utility.jst +++ b/source/Styles/xb3/jst/includes/utility.jst @@ -1237,20 +1237,18 @@ function current_operationalMode() $selectedOperationalMode=getStr("Device.X_RDKCENTRAL-COM_EthernetWAN.SelectedOperationalMode"); } else{ - if(is_docsis_supported()) { - $docsisEnable =getStr("Device.X_RDK_WanManager.Interface.1.Selection.Enable"); - $ethernetEnable =getStr("Device.X_RDK_WanManager.Interface.2.Selection.Enable"); - } else { - $ethernetEnable = getStr("Device.X_RDK_WanManager.Interface.1.Selection.Enable"); - $docsisEnable = "false"; - } - - if(($ethernetEnable=="true") && ($docsisEnable=="false")){ - $selectedOperationalMode="Ethernet"; - }else if(($ethernetEnable=="false") && ($docsisEnable=="true")){ - $selectedOperationalMode="DOCSIS"; - }else if(($ethernetEnable=="true") && ($docsisEnable=="true")){ - $selectedOperationalMode="Auto"; + $selectedOperationalMode = getStr("Device.X_RDK_WanManager.InterfaceAvailableStatus"); + if ($selectedOperationalMode == "") { + $selectedOperationalMode = "unknown"; + } + else if ($selectedOperationalMode.includes("|")) { + //If more than a single WAN is configured + $selectedOperationalMode = "auto"; + } + else { + // Split the string by comma and extract the first part + $parts = $selectedOperationalMode.split(","); + $selectedOperationalMode = $parts[0]; } } return $selectedOperationalMode; diff --git a/source/Styles/xb6/jst/wireless_network_configuration_onewifi.jst b/source/Styles/xb6/jst/wireless_network_configuration_onewifi.jst index 4566719..70a1fd5 100644 --- a/source/Styles/xb6/jst/wireless_network_configuration_onewifi.jst +++ b/source/Styles/xb6/jst/wireless_network_configuration_onewifi.jst @@ -808,6 +808,13 @@ $(document).ready(function() { $("#operation_mode1").prop("disabled", true); } }).trigger("change"); + $("#wireless_mode3").change(function() { + if ("ax"==$("#wireless_mode3").val()) { + $("#channel_bandwidth7").prop("disabled", true); + } else if("ax,be"==$("#wireless_mode3").val() || "be"==$("#wireless_mode3").val()) { + $("#channel_bandwidth7").prop("disabled", false); + } + }).trigger("change"); $("#channel_number").change(function() { show_extch(document.getElementById("channel_number").value); }).trigger("change"); @@ -1869,7 +1876,9 @@ if($OperatingChannelBandwidth == "6GHz")
- 400ns + + 400ns + />800ns @@ -2121,7 +2130,9 @@ if($OperatingChannelBandwidth == "6GHz")
- 400ns + + 400ns + />800ns @@ -2314,7 +2325,6 @@ if($OperatingChannelBandwidth == "6GHz")
- 400ns />800ns