Skip to content

Commit fa51c43

Browse files
committed
webaccess: port network configuration to NetworkManager
1 parent d245b68 commit fa51c43

File tree

4 files changed

+154
-368
lines changed

4 files changed

+154
-368
lines changed

webaccess/res/networkconfig.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,9 @@ function systemCmd(cmd, iface, mode, addr, mask, gw, ssid, wpapsk)
2323
}
2424

2525
function showStatic(iface, enable) {
26-
var divName = iface + "StaticFields";
27-
var obj=document.getElementById(divName);
28-
if (enable === true) {
29-
obj.style.visibility="visible";
30-
} else {
31-
obj.style.visibility="hidden";
32-
}
26+
document.getElementById(iface + "IPaddr").disabled = !enable;
27+
document.getElementById(iface + "Netmask").disabled = !enable;
28+
document.getElementById(iface + "Gateway").disabled = !enable;
3329
}
3430

3531
function applyParams(iface) {

webaccess/src/webaccess.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ void WebAccess::slotHandleWebSocketRequest(QHttpConnection *conn, QString data)
466466

467467
if (cmdList.at(1) == "NETWORK")
468468
{
469-
if (m_netConfig->updateNetworkFile(cmdList) == true)
469+
if (m_netConfig->updateNetworkSettings(cmdList) == true)
470470
{
471471
QString wsMessage = QString("ALERT|" + tr("Network configuration changed. Reboot to apply the changes."));
472472
conn->webSocketWrite(QHttpConnection::TextFrame, wsMessage.toUtf8());

0 commit comments

Comments
 (0)