Skip to content

Commit 805c7ee

Browse files
satish-kotapatiSukanya673anoopchelakkode
authored
RDKBDEV-3296: Xfinity Connection status page returns error 404 Not Found (#49)
Reason for change: webui connection status page returns error Test Procedure: login to webui and open connection status page Risks: None Signed-off-by: sai satish kotapati <skotapati@maxlinear.com> Co-authored-by: Sukanya673 <60687655+Sukanya673@users.noreply.github.com> Co-authored-by: anoopchelakkode <65686868+anoopchelakkode@users.noreply.github.com>
1 parent 7a46ce8 commit 805c7ee

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

source/Styles/xb3/jst/connection_status.jst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,8 +419,10 @@ if(($allowEthWan=="true") || ($autoWanEnable=="true")) {
419419
echo('<span class="value" id="actethwan">Active Ethernet WAN');
420420
}else if(strtolower($selectedOperationalMode)=="docsis"){
421421
echo('<span class="value" id="actdocwan">Active Docsis WAN');
422-
}else{
422+
}else if($selectedOperationalMode == "auto"){
423423
echo('<span class="value" id="actautwan">Active Auto WAN');
424+
}else{
425+
echo('<span class="value" id="unknown">Unknown WAN');
424426
}
425427
}else{
426428
$wan_enable= getStr("Device.Ethernet.X_RDKCENTRAL-COM_WAN.Enabled");

source/Styles/xb3/jst/includes/utility.jst

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,20 +1237,18 @@ function current_operationalMode()
12371237
$selectedOperationalMode=getStr("Device.X_RDKCENTRAL-COM_EthernetWAN.SelectedOperationalMode");
12381238
}
12391239
else{
1240-
if(is_docsis_supported()) {
1241-
$docsisEnable =getStr("Device.X_RDK_WanManager.Interface.1.Selection.Enable");
1242-
$ethernetEnable =getStr("Device.X_RDK_WanManager.Interface.2.Selection.Enable");
1243-
} else {
1244-
$ethernetEnable = getStr("Device.X_RDK_WanManager.Interface.1.Selection.Enable");
1245-
$docsisEnable = "false";
1246-
}
1247-
1248-
if(($ethernetEnable=="true") && ($docsisEnable=="false")){
1249-
$selectedOperationalMode="Ethernet";
1250-
}else if(($ethernetEnable=="false") && ($docsisEnable=="true")){
1251-
$selectedOperationalMode="DOCSIS";
1252-
}else if(($ethernetEnable=="true") && ($docsisEnable=="true")){
1253-
$selectedOperationalMode="Auto";
1240+
$selectedOperationalMode = getStr("Device.X_RDK_WanManager.InterfaceAvailableStatus");
1241+
if ($selectedOperationalMode == "") {
1242+
$selectedOperationalMode = "unknown";
1243+
}
1244+
else if ($selectedOperationalMode.includes("|")) {
1245+
//If more than a single WAN is configured
1246+
$selectedOperationalMode = "auto";
1247+
}
1248+
else {
1249+
// Split the string by comma and extract the first part
1250+
$parts = $selectedOperationalMode.split(",");
1251+
$selectedOperationalMode = $parts[0];
12541252
}
12551253
}
12561254
return $selectedOperationalMode;

0 commit comments

Comments
 (0)