From e7530e2447b92f811be78b0ff3d3f9bf6bbcb58c Mon Sep 17 00:00:00 2001 From: markjcrane Date: Thu, 12 Nov 2015 18:51:44 -0700 Subject: [PATCH] Correct polycom template logic and change the && (and) to || (or). --- resources/templates/provision/polycom/4.x/{$mac}.cfg | 2 +- resources/templates/provision/polycom/5.x/{$mac}.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/templates/provision/polycom/4.x/{$mac}.cfg b/resources/templates/provision/polycom/4.x/{$mac}.cfg index 868b864a97..c8f8e4a624 100644 --- a/resources/templates/provision/polycom/4.x/{$mac}.cfg +++ b/resources/templates/provision/polycom/4.x/{$mac}.cfg @@ -60,7 +60,7 @@ feature.enhancedFeatureKeys.enabled="1" {foreach $keys as $row} {if $row.device_key_category == "line"} - {if $row.device_key_type == "automata" && $row.device_key_type == "normal"} + {if $row.device_key_type == "automata" || $row.device_key_type == "normal"} attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}" attendant.resourceList.{$row.device_key_id}.callAddress="" attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}" diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg index 868b864a97..c8f8e4a624 100755 --- a/resources/templates/provision/polycom/5.x/{$mac}.cfg +++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg @@ -60,7 +60,7 @@ feature.enhancedFeatureKeys.enabled="1" {foreach $keys as $row} {if $row.device_key_category == "line"} - {if $row.device_key_type == "automata" && $row.device_key_type == "normal"} + {if $row.device_key_type == "automata" || $row.device_key_type == "normal"} attendant.resourceList.{$row.device_key_id}.address="{$row.device_key_value}" attendant.resourceList.{$row.device_key_id}.callAddress="" attendant.resourceList.{$row.device_key_id}.label="{$row.device_key_label}"