From 1afa546cafc8386cc1be6da90d57e4bfae73c8d2 Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Fri, 26 Aug 2016 14:55:29 -0600
Subject: [PATCH] Update the Aastra 675x template.

---
 .../provision/aastra/675x/{$mac}.cfg          | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/resources/templates/provision/aastra/675x/{$mac}.cfg b/resources/templates/provision/aastra/675x/{$mac}.cfg
index 0e57d5867c..dd6895633f 100644
--- a/resources/templates/provision/aastra/675x/{$mac}.cfg
+++ b/resources/templates/provision/aastra/675x/{$mac}.cfg
@@ -135,22 +135,31 @@ sip line{$row.line_number} registration period: 120    # requested registration
 # #################
 # Key assignment types blf, blfxfer, park, speeddial, dnd
 # #################
-{foreach $keys as $row}
-{if $row.device_key_category == "programmable"}
-prgkey{$row.device_key_id} type: {$row.device_key_type}
-prgkey{$row.device_key_id} line: {$row.device_key_line}
-prgkey{$row.device_key_id} value: {$row.device_key_value}
-{elseif $row.device_key_category == "line"}
+{foreach $keys["line"] as $row}
 topsoftkey{$row.device_key_id} type: {$row.device_key_type}
 topsoftkey{$row.device_key_id} line: {$row.device_key_line}
 topsoftkey{$row.device_key_id} value: {$row.device_key_value}
 topsoftkey{$row.device_key_id} label: {$row.device_key_label}
-{elseif $row.device_key_category == "memory"}
+
+{/foreach}
+
+{foreach $keys["memory"] as $row}
 softkey{$row.device_key_id} type: {$row.device_key_type}
 softkey{$row.device_key_id} line: {$row.device_key_line}
 softkey{$row.device_key_id} value: {$row.device_key_value}
 softkey{$row.device_key_id} label: {$row.device_key_label}
-{elseif $row.device_key_category == "expansion" && $row.device_key_id <= 60}
+
+{/foreach}
+
+{foreach $keys["programmable"] as $row}
+prgkey{$row.device_key_id} type: {$row.device_key_type}
+prgkey{$row.device_key_id} line: {$row.device_key_line}
+prgkey{$row.device_key_id} value: {$row.device_key_value}
+
+{/foreach}
+
+{foreach $keys["expansion"] as $row}
+{if $row.device_key_category == "expansion" && $row.device_key_id <= 60}
 expmod1 key{$row.device_key_id} type: {$row.device_key_type}
 expmod1 key{$row.device_key_id} line: {$row.device_key_line}
 expmod1 key{$row.device_key_id} value: {$row.device_key_value}
@@ -171,5 +180,5 @@ expmod4 key{$row.device_key_id-180} line: {$row.device_key_line}
 expmod4 key{$row.device_key_id-180} value: {$row.device_key_value}
 expmod4 key{$row.device_key_id-180} label: {$row.device_key_label}
 {/if}
-{/foreach}
 
+{/foreach}