Telephony enabled switch broken if no 4G (#169)

Author: seud0nym

CHANGELOG.txt

@@ -2,6 +2,7 @@
 ==========
 * tch-gui-unhide: Fixed Warning on setting landing page state
 * tch-gui-unhide: Fixed static leases in FW 17.2 which was broken by moving static leases to a separate tab in release 2023.05.16 (#168)
+* tch-gui-unhide: Fixed broken Telephony Enabled switch on devices with no 4G backup (#169)
 * move-lan-port-to-own-network: Removed - use the GUI to create VLANs
 
 2023.08.24

build/17.2/120-Telephony

@@ -1,5 +1,7 @@
-echo -e "[$SCRIPT]: Create Services.X_TELSTRA_VOLTE.map if it does not exist"
-[ ! -e /usr/share/transformer/mappings/bbf/Services.X_TELSTRA_VOLTE.map ] && cat <<"VOLTE" >/usr/share/transformer/mappings/bbf/Services.X_TELSTRA_VOLTE.map
+if [ -e /etc/config/mobiled_device_specific -a ! -e /usr/share/transformer/mappings/bbf/Services.X_TELSTRA_VOLTE.map ]; then
+  #region Services.X_TELSTRA_VOLTE.map
+  echo -e "[$SCRIPT]: Create Services.X_TELSTRA_VOLTE.map"
+  cat <<"VOLTE" >/usr/share/transformer/mappings/bbf/Services.X_TELSTRA_VOLTE.map
 -- Manually generated
 
 local lfs = require("lfs")
@@ -95,6 +97,8 @@ for _, dupli in ipairs(duplicates) do
 end
 
 VOLTE
+  #endregion
+fi
 
 if ! grep -q mmpbxmobilenet /usr/share/transformer/commitapply/uci_mmpbx.ca; then
   echo -e "[$SCRIPT]: Adding mmpbxmobilenet commit/apply action"

build/common/120-Telephony

@@ -25,7 +25,7 @@ fi
 if [ ! -e /etc/config/mobiled_device_specific ]; then
   echo -e "[$SCRIPT]: Remove VoLTE Tab and card info"
   sed -e '/mmpbx-volte-modal.lp/d' -i /www/snippets/tabs-voice.lp
-  sed -e '/--region VoLTE/,/--endregion/d' -i /www/lua/telephonycard_helper.lua
+  sed -e '/--region VoLTE/,/--endregion/d' -e 's/No SIP profiles or VoLTE enabled/No SIP profiles enabled/' -i /www/lua/telephonycard_helper.lua
   rm -f /usr/share/transformer/mappings/uci/mobiled_device_specific.map /usr/share/transformer/commitapply/mobiled_device_specific.ca
   rm -f /usr/share/transformer/mappings/uci/mobiled_sessions.map /usr/share/transformer/commitapply/mobiled_sessions.ca
 fi

src/common/telephony/www/docroot/modals/mmpbx-global-modal.lp

@@ -31,6 +31,10 @@ local mapParams = {
   mmpbx_enabled = "[email protected]",
   voiceonfailover = "uci.wansensing.global.voiceonfailover",
 }
+if mobile_devices == 0 then
+  mapParams.voiceonfailover = nil
+  mapValid.voiceonfailover = nil
+end
 local content = post_helper.handleQuery(mapParams,mapValid)
 
 local split = require("split").split
@@ -302,7 +306,7 @@ local sipnet_options = {
   canDelete = false,
 }
 
-if cfg["wansensing_enabled"] == "1" and content["voiceonfailover"] == "1" then
+if mobile_devices == 0 and cfg["wansensing_enabled"] == "1" and content["voiceonfailover"] == "1" then
   sipnet_columns[10]["readonly"] = true
   sipnet_columns[10]["header"] = sipnet_columns[10]["header"].." <span class='icon-question-sign' title='Interface is controlled by WAN Sensing.'></span>"
 end
@@ -331,7 +335,7 @@ ngx.print('\
   html[#html+1] =     ui_helper.createSwitch(T"Telephony Enabled","mmpbx_enabled",content["mmpbx_enabled"])
   if cfg["wansensing_enabled"] == "1" and mobile_devices > 0 then
     html[#html+1] =     ui_helper.createSwitch(T"Voice on 4G Failover","voiceonfailover",content["voiceonfailover"])
-  else
+  elseif content["voiceonfailover"] then
     html[#html + 1] =   ui_helper.createSimpleInputHidden("voiceonfailover",content["voiceonfailover"])
   end
   html[#html+1] = '<fieldset>'