UI-2026: Fixed key press confusion for good (or not_

i18n/en-US.json

@@ -313,7 +313,7 @@
 			"new": "New Landline",
 			"number": "Number",
 			"numberPlaceholder": "+14152231121",
-			"requireKeypress": "Require Key Press",
+			"requireKeypress": "Allow use of landline's voicemail",
 			"keepCallerId": "Keep Original Caller-ID",
 			"hideContactList": "Hide from Contact List"
 		},
@@ -324,7 +324,7 @@
 			"new": "New Cell Phone",
 			"number": "Number",
 			"numberPlaceholder": "+14152231121",
-			"requireKeypress": "Allow use of cellphone voicemail",
+			"requireKeypress": "Allow use of cellphone's voicemail",
 			"keepCallerId": "Keep Original Caller-ID",
 			"hideContactList": "Hide from Contact List"
 		},
@@ -341,7 +341,7 @@
 			"deviceName": "Device Name",
 			"editTitle": "Editing Smartphone: {{name}}",
 			"new": "New Smartphone",
-			"requireKeypress": "Allow use of cellphone voicemail",
+			"requireKeypress": "Allow use of smartphone's voicemail",
 			"keepCallerId": "Keep Original Caller-ID",
 			"hideContactList": "Hide from Contact List"
 		},

submodules/devices/devices.js

@@ -550,6 +550,10 @@ define(function(require){
 				if (originalData.device_type === 'smartphone') {
 					formData.call_forward.failover = true;
 				}
+
+				if(formData.hasOwnProperty('extra') && formData.extra.allowVMCellphone) {
+					formData.call_forward.require_keypress = !formData.extra.allowVMCellphone;
+				}
 			}
 
 			if(hasCodecs) {
@@ -803,6 +807,10 @@ define(function(require){
 
 			formattedData.extra.isRegistered = dataList.isRegistered;
 
+			if(formattedData.hasOwnProperty('call_forward') && formattedData.call_forward.hasOwnProperty('require_keypress')) {
+				formattedData.extra.allowVMCellphone = !formattedData.call_forward.require_keypress;
+			}
+
 			return formattedData;
 		},
 

views/devices-cellphone.html

@@ -49,7 +49,7 @@
 					<label class="control-label" for="require_keypress"></label>
 					<div class="controls">
 						{{#monsterCheckbox i18n.devices.cellphone.requireKeypress }}
-							<input id="require_keypress" type="checkbox" name="call_forward.require_keypress"{{#if call_forward.require_keypress}} checked="checked"{{/if}}></input>
+							<input id="require_keypress" type="checkbox" name="extra.allowVMCellphone"{{#if extra.allowVMCellphone}} checked="checked"{{/if}}></input>
 						{{/monsterCheckbox}}
 					</div>
 				</div>

views/devices-landline.html

@@ -50,7 +50,7 @@
 					<div class="controls">
 						<label>
 							{{#monsterCheckbox i18n.devices.landline.requireKeypress }}
-								<input id="require_keypress" type="checkbox" name="call_forward.require_keypress"{{#if call_forward.require_keypress}} checked="checked"{{/if}}></input>
+								<input id="require_keypress" type="checkbox" name="extra.allowVMCellphone"{{#if extra.allowVMCellphone}} checked="checked"{{/if}}></input>
 							{{/monsterCheckbox}}
 						</label>
 					</div>

views/devices-smartphone.html

@@ -74,7 +74,7 @@
 					<div class="controls">
 						<label>
 							{{#monsterCheckbox i18n.devices.smartphone.requireKeypress }}
-								<input id="require_keypress" type="checkbox" name="call_forward.require_keypress"{{#if call_forward.require_keypress}} checked="checked"{{/if}}></input>
+								<input id="require_keypress" type="checkbox" name="extra.allowVMCellphone"{{#if extra.allowVMCellphone}} checked="checked"{{/if}}></input>
 							{{/monsterCheckbox}}
 						</label>
 					</div>