Skip to content

Commit

Permalink
fix(web2): Fixed wireless mode selection (#5583)
Browse files Browse the repository at this point in the history
Fixed wireless mode selection

Signed-off-by: pierantoniomerlino <[email protected]>
  • Loading branch information
pierantoniomerlino authored Nov 27, 2024
1 parent 4e89455 commit d4b7cfd
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,11 @@ public TabWirelessUi(GwtSession currentSession, TabIp4Ui tcp4, TabIp6Ui tcp6,
setPasswordValidation();

this.tcp4Tab.status.addChangeHandler(event -> {
evalActiveConfig();
evalActiveConfig();
});

this.tcp6Tab.status.addChangeHandler(event -> {
evalActiveConfig();
evalActiveConfig();
});

logger.info("Constructor done.");
Expand All @@ -380,8 +380,8 @@ private void evalActiveConfig() {
|| !tcpIp6Status.equals(TabWirelessUi.this.tcp6Status);

if (isStatusChanged) {
if (tcpIp4Status.equals(GwtNetIfStatus.netIPv4StatusEnabledWAN.name())
|| tcpIp6Status.equals(GwtNetIfStatus.netIPv6StatusEnabledWAN.name())) {
if (tcpIp4Status.equals(MessageUtils.get(GwtNetIfStatus.netIPv4StatusEnabledWAN.name()))
|| tcpIp6Status.equals(MessageUtils.get(GwtNetIfStatus.netIPv6StatusEnabledWAN.name()))) {
TabWirelessUi.this.activeConfig = TabWirelessUi.this.selectedNetIfConfig.getStationWifiConfig();
} else {
TabWirelessUi.this.activeConfig = TabWirelessUi.this.selectedNetIfConfig.getActiveWifiConfig();
Expand All @@ -390,7 +390,7 @@ private void evalActiveConfig() {
TabWirelessUi.this.tcp4Status = tcpIp4Status;
TabWirelessUi.this.tcp6Status = tcpIp6Status;
TabWirelessUi.this.netTabs.updateTabs();

update();
}
}
Expand Down Expand Up @@ -619,8 +619,8 @@ private void refreshForm() {
String tcpip6Status = this.tcp6Tab.getStatus();

// Tcp/IP disabled
if (tcpip4Status.equals(GwtNetIfStatus.netIPv4StatusDisabled.getValue())
&& tcpip6Status.equals(GwtNetIfStatus.netIPv6StatusDisabled.getValue())) {
if (tcpip4Status.equals(MessageUtils.get(GwtNetIfStatus.netIPv4StatusDisabled.name()))
&& tcpip6Status.equals(MessageUtils.get(GwtNetIfStatus.netIPv6StatusDisabled.name()))) {
setForm(false);
} else {
setForm(true);
Expand Down Expand Up @@ -732,7 +732,7 @@ private void refreshForm() {
if (this.security.getSelectedItemText().equals(WIFI_SECURITY_WPA2_WPA3_ENTERPRISE_MESSAGE)) {
this.password.setEnabled(false);
}

loadCountryCode();
}

Expand Down

0 comments on commit d4b7cfd

Please sign in to comment.