From 0f56dcc01a3d61c1904aa042b752b26bb0c2d237 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Fri, 3 Jan 2014 02:55:16 +0000
Subject: [PATCH] Update the provisioning key assignment so that it will work
 for yealink phones.

---
 resources/templates/provision/yealink/t20/{$mac}.cfg   | 2 +-
 resources/templates/provision/yealink/t22/{$mac}.cfg   | 2 +-
 resources/templates/provision/yealink/t32g/{$mac}.cfg  | 6 +++---
 resources/templates/provision/yealink/t38g/{$mac}.cfg  | 6 +++---
 resources/templates/provision/yealink/vp530/{$mac}.cfg | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/templates/provision/yealink/t20/{$mac}.cfg b/resources/templates/provision/yealink/t20/{$mac}.cfg
index b5bcdbd6f1..e912206623 100644
--- a/resources/templates/provision/yealink/t20/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t20/{$mac}.cfg
@@ -1897,7 +1897,7 @@ forward.international.enable =
 {foreach $keys as $row}
 {if $row.device_key_category == "line"}
 #Configure Line Key {$row.device_key_id}
-linekey.{$row.device_key_id}.line = {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_value}
 linekey.{$row.device_key_id}.value = {$row.device_key_value}
 linekey.{$row.device_key_id}.pickup_value = 
 linekey.{$row.device_key_id}.type = {$row.device_key_type}
diff --git a/resources/templates/provision/yealink/t22/{$mac}.cfg b/resources/templates/provision/yealink/t22/{$mac}.cfg
index b5bcdbd6f1..e912206623 100644
--- a/resources/templates/provision/yealink/t22/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t22/{$mac}.cfg
@@ -1897,7 +1897,7 @@ forward.international.enable =
 {foreach $keys as $row}
 {if $row.device_key_category == "line"}
 #Configure Line Key {$row.device_key_id}
-linekey.{$row.device_key_id}.line = {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_value}
 linekey.{$row.device_key_id}.value = {$row.device_key_value}
 linekey.{$row.device_key_id}.pickup_value = 
 linekey.{$row.device_key_id}.type = {$row.device_key_type}
diff --git a/resources/templates/provision/yealink/t32g/{$mac}.cfg b/resources/templates/provision/yealink/t32g/{$mac}.cfg
index 1a70a263aa..f5b4344ed0 100644
--- a/resources/templates/provision/yealink/t32g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t32g/{$mac}.cfg
@@ -1897,7 +1897,7 @@ forward.international.enable =
 {foreach $keys as $row}
 {if $row.device_key_category == "line"}
 #Configure Line Key {$row.device_key_id}
-linekey.{$row.device_key_id}.line = {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_value}
 linekey.{$row.device_key_id}.value = {$row.device_key_value}
 linekey.{$row.device_key_id}.pickup_value = 
 linekey.{$row.device_key_id}.type = {$row.device_key_type}
@@ -1930,7 +1930,7 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label}
 {if $row.device_key_category == "memory"}
 #Expansion Memory Key {$row.device_key_id}
 memorykey.{$row.device_key_id}.type = {$row.device_key_type}
-memorykey.{$row.device_key_id}.line = {$row.device_key_id}
+memorykey.{$row.device_key_id}.line = {$row.device_key_value}
 memorykey.{$row.device_key_id}.value = {$row.device_key_value}
 memorykey.{$row.device_key_id}.pickup_value = 
 memorykey.{$row.device_key_id}.label = {$row.device_key_label}
@@ -1985,7 +1985,7 @@ programablekey.1.label =
 {if $row.device_key_category == "expansion"}
 #Expansion module 1 key {$row.device_key_id}
 expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
-expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_id}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_value}
 expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
 expansion_module.1.key.{$row.device_key_id}.pickup_value = 
 expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
diff --git a/resources/templates/provision/yealink/t38g/{$mac}.cfg b/resources/templates/provision/yealink/t38g/{$mac}.cfg
index 1a70a263aa..f5b4344ed0 100644
--- a/resources/templates/provision/yealink/t38g/{$mac}.cfg
+++ b/resources/templates/provision/yealink/t38g/{$mac}.cfg
@@ -1897,7 +1897,7 @@ forward.international.enable =
 {foreach $keys as $row}
 {if $row.device_key_category == "line"}
 #Configure Line Key {$row.device_key_id}
-linekey.{$row.device_key_id}.line = {$row.device_key_id}
+linekey.{$row.device_key_id}.line = {$row.device_key_value}
 linekey.{$row.device_key_id}.value = {$row.device_key_value}
 linekey.{$row.device_key_id}.pickup_value = 
 linekey.{$row.device_key_id}.type = {$row.device_key_type}
@@ -1930,7 +1930,7 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label}
 {if $row.device_key_category == "memory"}
 #Expansion Memory Key {$row.device_key_id}
 memorykey.{$row.device_key_id}.type = {$row.device_key_type}
-memorykey.{$row.device_key_id}.line = {$row.device_key_id}
+memorykey.{$row.device_key_id}.line = {$row.device_key_value}
 memorykey.{$row.device_key_id}.value = {$row.device_key_value}
 memorykey.{$row.device_key_id}.pickup_value = 
 memorykey.{$row.device_key_id}.label = {$row.device_key_label}
@@ -1985,7 +1985,7 @@ programablekey.1.label =
 {if $row.device_key_category == "expansion"}
 #Expansion module 1 key {$row.device_key_id}
 expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
-expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_id}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_value}
 expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
 expansion_module.1.key.{$row.device_key_id}.pickup_value = 
 expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}
diff --git a/resources/templates/provision/yealink/vp530/{$mac}.cfg b/resources/templates/provision/yealink/vp530/{$mac}.cfg
index d010423a4c..1b2881b4ed 100644
--- a/resources/templates/provision/yealink/vp530/{$mac}.cfg
+++ b/resources/templates/provision/yealink/vp530/{$mac}.cfg
@@ -1398,7 +1398,7 @@ forward.no_answer.off_code =
 #Configure Line Key {$row.device_key_id}
 linekey.{$row.device_key_id}.line = {$row.device_key_id}
 linekey.{$row.device_key_id}.value = {$row.device_key_value}
-linekey.{$row.device_key_id}.pickup_value = 
+linekey.{$row.device_key_id}.pickup_value = {$row.device_key_value}
 linekey.{$row.device_key_id}.type = {$row.device_key_type}
 linekey.{$row.device_key_id}.xml_phonebook = 
 linekey.{$row.device_key_id}.label = {$row.device_key_label}
@@ -1429,7 +1429,7 @@ linekey.{$row.device_key_id}.label = {$row.device_key_label}
 {if $row.device_key_category == "memory"}
 #Expansion Memory Key {$row.device_key_id}
 memorykey.{$row.device_key_id}.type = {$row.device_key_type}
-memorykey.{$row.device_key_id}.line = {$row.device_key_id}
+memorykey.{$row.device_key_id}.line = {$row.device_key_value}
 memorykey.{$row.device_key_id}.value = {$row.device_key_value}
 memorykey.{$row.device_key_id}.pickup_value = 
 memorykey.{$row.device_key_id}.label = {$row.device_key_label}
@@ -1484,7 +1484,7 @@ programablekey.1.label =
 {if $row.device_key_category == "expansion"}
 #Expansion module 1 key {$row.device_key_id}
 expansion_module.1.key.{$row.device_key_id}.type = {$row.device_key_type}
-expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_id}
+expansion_module.1.key.{$row.device_key_id}.line = {$row.device_key_value}
 expansion_module.1.key.{$row.device_key_id}.value = {$row.device_key_value}
 expansion_module.1.key.{$row.device_key_id}.pickup_value = 
 expansion_module.1.key.{$row.device_key_id}.label = {$row.device_key_label}