From bb40b8e7b3ee3fa6d33b26717fceecb978203dee Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Sun, 27 Sep 2020 21:04:22 +0200 Subject: [PATCH] luci-app-travelmate: add missing wpa3 ent. modes Signed-off-by: Dirk Brenken --- .../resources/view/travelmate/stations.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js b/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js index 8b3b7d3993..72d37dc1fb 100644 --- a/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js +++ b/applications/luci-app-travelmate/htdocs/luci-static/resources/view/travelmate/stations.js @@ -254,7 +254,7 @@ return view.extend({ o.readonly = true; o = s.taboption('wireless', form.ListValue, 'encryption', _('Encryption')); - o.value('sae', _('WPA3 Pers.')); + o.value('sae', _('WPA3 Pers. (SAE)')); o.value('sae-mixed', _('WPA2/WPA3 Pers. (CCMP)')); o.value('psk2', _('WPA2 Pers.')); o.value('psk2+ccmp', _('WPA2 Pers. (CCMP)')); @@ -264,8 +264,8 @@ return view.extend({ o.value('psk+tkip', _('WPA Pers. (TKIP)')); o.value('psk-mixed+ccmp', _('WPA/WPA2 Pers. (CCMP)')); o.value('psk-mixed+tkip', _('WPA/WPA2 Pers. (TKIP)')); - o.value('wpa3', _('WPA3 Ent.')); - o.value('wpa3-mixed', _('WPA3/WPA2 Ent.')); + o.value('wpa3', _('WPA3 Ent. (CCMP)')); + o.value('wpa3-mixed', _('WPA2/WPA3 Ent. (CCMP)')); o.value('wpa2+ccmp', _('WPA2 Ent. (CCMP)')); o.value('wpa2+tkip', _('WPA2 Ent. (TKIP)')); o.value('wpa+ccmp', _('WPA Ent. (CCMP)')); @@ -303,10 +303,10 @@ return view.extend({ cfgvalue = 'WPA/WPA2 Pers. (TKIP)'; break; case 'wpa3': - cfgvalue = 'WPA3 Ent.'; + cfgvalue = 'WPA3 Ent. (CCMP)'; break; case 'wpa3-mixed': - cfgvalue = 'WPA3/WPA2 Ent.'; + cfgvalue = 'WPA2/WPA3 Ent. (CCMP)'; break; case 'wpa2+ccmp': cfgvalue = 'WPA2 Ent. (CCMP)'; @@ -638,6 +638,14 @@ return view.extend({ encryption = 'psk-mixed+ccmp'; tbl_encryption = 'WPA/WPA2 Pers. (CCMP)'; break; + case 'WPA3 802.1X (CCMP)': + encryption = 'wpa3'; + tbl_encryption = 'WPA3 Ent. (CCMP)'; + break; + case 'mixed WPA2/WPA3 802.1X (CCMP)': + encryption = 'wpa3-mixed'; + tbl_encryption = 'WPA2/WPA3 Ent. (CCMP)'; + break; case 'WPA PSK (CCMP)': encryption = 'psk2+ccmp'; tbl_encryption = 'WPA Pers. (CCMP)'; -- 2.30.2