From ac0f600896b000cb0f2c87e56e71229312d01877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Gonz=C3=A1lez?= <fernandomenjivar2011@gmail.com>
Date: Fri, 31 Jul 2020 15:15:22 -0600
Subject: [PATCH] Restrict function key options for line key mod (#245)

---
 submodules/devices/devices.js                  | 18 ++++++++++++------
 .../devices/views/devices-sip_device.html      | 14 +++++++++++---
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 702af74..5fd6938 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -942,8 +942,7 @@ define(function(require) {
 				),
 				defaultLineKeys = _.get(
 					self.appFlags.devices.provisionerConfigFlags,
-					['brands', _.get(data.device, 'provision.endpoint_brand'), 'lineKeys'],
-					[1]
+					['brands', _.get(data.device, 'provision.endpoint_brand'), 'lineKeys']
 				),
 				isClassifierDisabledByAccount = function isClassifierDisabledByAccount(classifier) {
 					return _.get(data.accountLimits, ['call_restriction', classifier, 'action']) === 'deny';
@@ -1078,7 +1077,7 @@ define(function(require) {
 								return _.merge({
 									id: type,
 									type: camelCasedType,
-									lineKeys: defaultLineKeys,
+									lineKeys: defaultLineKeys || [1],
 									actions: _
 										.chain([
 											'presence',
@@ -1094,13 +1093,20 @@ define(function(require) {
 										})
 										.concat(['none'])
 										.map(function(action) {
-											var i18n = self.i18n.active().devices.popupSettings.keys;
+											var i18n = self.i18n.active().devices.popupSettings.keys,
+												hasDefaultLineKeys = !!defaultLineKeys,
+												allowedDefaultLineKeyActions = ['none', 'line'];
 
-											return {
+											return _.merge({
 												id: action,
 												info: _.get(i18n, ['info', 'types', action]),
 												label: _.get(i18n, ['types', action])
-											};
+											},
+											type === 'combo_keys' && hasDefaultLineKeys && !_.includes(allowedDefaultLineKeyActions, action) ? {
+												isActionRestringed: true
+											}
+											: {}
+											);
 										})
 										// Sort alphabetically while keeping `none` as first item
 										.sort(function(a, b) {
diff --git a/submodules/devices/views/devices-sip_device.html b/submodules/devices/views/devices-sip_device.html
index 1b72571..cd60790 100644
--- a/submodules/devices/views/devices-sip_device.html
+++ b/submodules/devices/views/devices-sip_device.html
@@ -366,9 +366,17 @@
 								<select name="provision.keys.{{../id}}[{{@index}}].type" class="feature-key-type span2">
 								{{#select type}}
 									{{#each ../actions}}
-										<option value="{{id}}">
-											{{label}}
-										</option>
+										{{#ifInArray ../keyNumber ../../lineKeys}}
+											{{#unless isActionRestringed}}
+												<option value="{{id}}">
+													{{label}}
+												</option>
+											{{/unless}}
+										{{else}}
+											<option value="{{id}}">
+												{{label}}
+											</option>
+										{{/ifInArray}}
 									{{/each}}
 								{{/select}}
 								</select>