webaccess: port network configuration to NetworkManager

mcallegari · Feb 4, 2024 · fa51c43 · fa51c43
1 parent d245b68
commit fa51c43
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 368 deletions.
diff --git a/webaccess/res/networkconfig.js b/webaccess/res/networkconfig.js
@@ -23,13 +23,9 @@ function systemCmd(cmd, iface, mode, addr, mask, gw, ssid, wpapsk)
 }
 
 function showStatic(iface, enable) {
- var divName = iface + "StaticFields";
- var obj=document.getElementById(divName);
- if (enable === true) {
-   obj.style.visibility="visible";
- } else {
-   obj.style.visibility="hidden";
- }
+ document.getElementById(iface + "IPaddr").disabled = !enable;
+ document.getElementById(iface + "Netmask").disabled = !enable;
+ document.getElementById(iface + "Gateway").disabled = !enable;
 }
 
 function applyParams(iface) {

diff --git a/webaccess/src/webaccess.cpp b/webaccess/src/webaccess.cpp
@@ -466,7 +466,7 @@ void WebAccess::slotHandleWebSocketRequest(QHttpConnection *conn, QString data)
 
         if (cmdList.at(1) == "NETWORK")
         {
-            if (m_netConfig->updateNetworkFile(cmdList) == true)
+            if (m_netConfig->updateNetworkSettings(cmdList) == true)
             {
                 QString wsMessage = QString("ALERT|" + tr("Network configuration changed. Reboot to apply the changes."));
                 conn->webSocketWrite(QHttpConnection::TextFrame, wsMessage.toUtf8());