From b078990f973fadf3873cb8a4c7d77ce8bc1502e2 Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Fri, 26 Aug 2016 14:09:56 -0600
Subject: [PATCH] Update the polycom templates.

---
 .../provision/polycom/4.x/{$mac}.cfg          | 36 ++++++++++---------
 .../provision/polycom/5.x/{$mac}.cfg          | 30 ++++++++--------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/resources/templates/provision/polycom/4.x/{$mac}.cfg b/resources/templates/provision/polycom/4.x/{$mac}.cfg
index 9dc51a6f6f..4b91fa1e5d 100644
--- a/resources/templates/provision/polycom/4.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/4.x/{$mac}.cfg
@@ -85,22 +85,20 @@
 			attendant.behaviors.display.spontaneousCallAppearances.normal="0"
 		{/if}
 		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"}
-					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}"
-					attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
-					attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
-				{else}
-					{if $row.device_key_type != "line"}
-						{if $row.device_key_type == "URL"}
-							key.{$row.device_key_id}.function.prim="{$row.device_key_value}"
-						{else}
-							key.{$row.device_key_id}.function.prim="{$row.device_key_type}"
-							key.{$row.device_key_id}.subPoint.prim="{$row.device_key_value}"
-						{/if}
+		{foreach $keys["line"] as $row}
+			{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}"
+				attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
+				attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
+			{else}
+				{if $row.device_key_type != "line"}
+					{if $row.device_key_type == "URL"}
+						key.{$row.device_key_id}.function.prim="{$row.device_key_value}"
+					{else}
+						key.{$row.device_key_id}.function.prim="{$row.device_key_type}"
+						key.{$row.device_key_id}.subPoint.prim="{$row.device_key_value}"
 					{/if}
 				{/if}
 			{/if}
@@ -124,6 +122,12 @@
 		{if $headset_mode != ''}up.handsfreeMode="1"
 		up.headsetMode="{$headset_mode}"{/if}
 		{if $analog_headset_option != ''}up.analogHeadsetOption="{$analog_headset_option}"{/if}
+		{if isset($polycom_onetouchvoicemail)}
+			up.oneTouchVoiceMail="{$polycom_onetouchvoicemail}"
+			{else}
+			up.oneTouchVoiceMail="0"
+		{/if}
+
 	/>
 	<SOFT_KEYS
 		softkey.1.label="VMTransfer"
diff --git a/resources/templates/provision/polycom/5.x/{$mac}.cfg b/resources/templates/provision/polycom/5.x/{$mac}.cfg
index 8f2f373cf7..4b91fa1e5d 100755
--- a/resources/templates/provision/polycom/5.x/{$mac}.cfg
+++ b/resources/templates/provision/polycom/5.x/{$mac}.cfg
@@ -85,22 +85,20 @@
 			attendant.behaviors.display.spontaneousCallAppearances.normal="0"
 		{/if}
 		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"}
-					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}"
-					attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
-					attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
-				{else}
-					{if $row.device_key_type != "line"}
-						{if $row.device_key_type == "URL"}
-							key.{$row.device_key_id}.function.prim="{$row.device_key_value}"
-						{else}
-							key.{$row.device_key_id}.function.prim="{$row.device_key_type}"
-							key.{$row.device_key_id}.subPoint.prim="{$row.device_key_value}"
-						{/if}
+		{foreach $keys["line"] as $row}
+			{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}"
+				attendant.resourceList.{$row.device_key_id}.proceedingIsRecipient="0"
+				attendant.resourceList.{$row.device_key_id}.type="{$row.device_key_type}"
+			{else}
+				{if $row.device_key_type != "line"}
+					{if $row.device_key_type == "URL"}
+						key.{$row.device_key_id}.function.prim="{$row.device_key_value}"
+					{else}
+						key.{$row.device_key_id}.function.prim="{$row.device_key_type}"
+						key.{$row.device_key_id}.subPoint.prim="{$row.device_key_value}"
 					{/if}
 				{/if}
 			{/if}