diff --git a/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml b/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml index d074a82a..a287a25c 100644 --- a/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml +++ b/quickshell/Modules/ControlCenter/Details/NetworkDetail.qml @@ -644,6 +644,7 @@ Rectangle { wifiContent.menuOpen = true; networkContextMenu.currentSSID = modelData.ssid; networkContextMenu.currentSecured = modelData.secured; + networkContextMenu.currentEnterprise = modelData.enterprise; networkContextMenu.currentConnected = wifiDelegate.isConnected; networkContextMenu.currentSaved = modelData.saved; networkContextMenu.currentSignal = modelData.signal; @@ -744,7 +745,7 @@ Rectangle { event.accepted = true; return; } - if (modelData.secured && !modelData.saved && DMSService.apiVersion < 7) { + if (modelData.secured && !modelData.saved && (DMSService.apiVersion < 7 || modelData.enterprise)) { PopoutService.showWifiPasswordModal(modelData.ssid); } else { NetworkService.connectToWifi(modelData.ssid); @@ -762,6 +763,7 @@ Rectangle { property string currentSSID: "" property bool currentSecured: false + property bool currentEnterprise: false property bool currentConnected: false property bool currentSaved: false property int currentSignal: 0 @@ -802,7 +804,7 @@ Rectangle { NetworkService.disconnectWifi(); return; } - if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved && DMSService.apiVersion < 7) { + if (networkContextMenu.currentSecured && !networkContextMenu.currentSaved && (DMSService.apiVersion < 7 || networkContextMenu.currentEnterprise)) { PopoutService.showWifiPasswordModal(networkContextMenu.currentSSID); return; } diff --git a/quickshell/Modules/Settings/NetworkTab.qml b/quickshell/Modules/Settings/NetworkTab.qml index a229314e..677c90de 100644 --- a/quickshell/Modules/Settings/NetworkTab.qml +++ b/quickshell/Modules/Settings/NetworkTab.qml @@ -1324,6 +1324,10 @@ Item { NetworkService.disconnectWifi(); return; } + if (modelData.secured && !modelData.saved && (DMSService.apiVersion < 7 || modelData.enterprise)) { + PopoutService.showWifiPasswordModal(modelData.ssid); + return; + } NetworkService.connectToWifi(modelData.ssid); } }