summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2013-03-19 15:23:52 +0000
committerTed Trask <ttrask01@yahoo.com>2013-05-25 20:05:42 +0000
commite835876a10ffcf6a0cf84aa891924648498e0bf5 (patch)
treee37564781ad7cd48e6e17f3e0cd5ce4bb06b39a3
parent841d4e2e5d0d191ee3c9e9366d5fa1b82b0a1f0c (diff)
downloadacf-provisioning-e835876a10ffcf6a0cf84aa891924648498e0bf5.tar.bz2
acf-provisioning-e835876a10ffcf6a0cf84aa891924648498e0bf5.tar.xz
Fix null string concatination errors in polycom template
(cherry picked from commit 0c25cb523206e49188e15388167be9b71fa1c692)
-rw-r--r--config/templates/polycom-template.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/config/templates/polycom-template.lua b/config/templates/polycom-template.lua
index db01510..cf456d1 100644
--- a/config/templates/polycom-template.lua
+++ b/config/templates/polycom-template.lua
@@ -163,7 +163,7 @@ if values.services then
if values.services.forwarding then
enable.forwarding = true
end
- if values.services.hotlineenable then
+ if values.services.hotlineenable and values.services.hotlinedestination then
enable.hotline = true
-- Set phone to replace any dialed digits with the hotline destination instead
xml_attr({ 'dialplan.digitmap' }, 'R[#*0123456789].R'..values.services.hotlinedestination..'R')
@@ -211,7 +211,9 @@ for pg, pg_t in pairs(values) do
-- Caller ID string
xml_attr({ 'reg', num, 'displayName' }, pg_t.callerid)
-- Ringtone
- xml_attr({ 'reg', num, 'ringType'}, 'ringer'..pg_t.polycomringtone)
+ if pg_t.polycomringtone then
+ xml_attr({ 'reg', num, 'ringType'}, 'ringer'..pg_t.polycomringtone)
+ end
-- From Admin_Guide_UCS_v3.3.0:
-- "The phone has a flexible call forward/diversion feature for each registration. In all cases, a call will only be diverted if a non-Null contact has been configured."