From 256816d5502c2ab60a66803e9d7b8566be847495 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris.tirado@gmail.com>
Date: Mon, 8 Feb 2016 10:26:32 -0800
Subject: [PATCH 1/2] UI-2013: Allow users to create smartphone devices

---
 views/devices-layout.html | 2 +-
 views/users-devices.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/devices-layout.html b/views/devices-layout.html
index 1c1f000..e6164f5 100644
--- a/views/devices-layout.html
+++ b/views/devices-layout.html
@@ -13,7 +13,7 @@
 			<ul class="dropdown-menu">
 				<li><a class="create-device" data-type="sip_device"><i class="icon-telicon-voip-phone"></i>{{ i18n.devices.types.sip_device }}</a></li>
 				<li><a class="create-device" data-type="cellphone"><i class="fa fa-phone"></i>{{ i18n.devices.types.cellphone }}</a></li>
-				<!-- <li><a class="create-device" data-type="smartphone"><i class="icon-telicon-mobile-phone"></i>{{ i18n.devices.types.smartphone }}</a></li> -->
+				<li><a class="create-device" data-type="smartphone"><i class="icon-telicon-mobile-phone"></i>{{ i18n.devices.types.smartphone }}</a></li>
 				<li><a class="create-device" data-type="softphone"><i class="icon-telicon-soft-phone"></i>{{ i18n.devices.types.softphone }}</a></li>
 				<li><a class="create-device" data-type="landline"><i class="icon-telicon-home"></i>{{ i18n.devices.types.landline }}</a></li>
 				<li><a class="create-device" data-type="fax"><i class="icon-telicon-fax"></i>{{ i18n.devices.types.fax }}</a></li>
diff --git a/views/users-devices.html b/views/users-devices.html
index 0dfad56..4607a15 100644
--- a/views/users-devices.html
+++ b/views/users-devices.html
@@ -23,7 +23,7 @@
 			<ul class="dropdown-menu">
 				<li><a class="create-device" data-type="sip_device"><i class="icon-telicon-voip-phone"></i>{{ i18n.devices.types.sip_device }}</a></li>
 				<li><a class="create-device" data-type="cellphone"><i class="fa fa-phone"></i>{{ i18n.devices.types.cellphone }}</a></li>
-				<!-- <li><a class="create-device" data-type="smartphone"><i class="icon-telicon-mobile-phone"></i>{{ i18n.devices.types.smartphone }}</a></li> -->
+				<li><a class="create-device" data-type="smartphone"><i class="icon-telicon-mobile-phone"></i>{{ i18n.devices.types.smartphone }}</a></li>
 				<li><a class="create-device" data-type="softphone"><i class="icon-telicon-soft-phone"></i>{{ i18n.devices.types.softphone }}</a></li>
 				<li><a class="create-device" data-type="landline"><i class="icon-telicon-home"></i>{{ i18n.devices.types.landline }}</a></li>
 				<li><a class="create-device" data-type="fax"><i class="icon-telicon-fax"></i>{{ i18n.devices.types.fax }}</a></li>

From 3d5dc220d19e6011c1b9c37c4e9cb32762c2aa71 Mon Sep 17 00:00:00 2001
From: Joris Tirado <joris.tirado@gmail.com>
Date: Tue, 9 Feb 2016 11:13:21 -0800
Subject: [PATCH 2/2] OOB: Set failover property to true for smarphones; Fix
 bug on device un-assingnment

---
 submodules/devices/devices.js | 4 ++++
 submodules/users/users.js     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js
index 088f891..041aabe 100644
--- a/submodules/devices/devices.js
+++ b/submodules/devices/devices.js
@@ -546,6 +546,10 @@ define(function(require){
 					require_keypress: true,
 					keep_caller_id: true
 				}, formData.call_forward);
+
+				if (originalData.device_type === 'smartphone') {
+					formData.call_forward.failover = true;
+				}
 			}
 
 			if(hasCodecs) {
diff --git a/submodules/users/users.js b/submodules/users/users.js
index 6414cef..34848b5 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1039,7 +1039,7 @@ define(function(require){
 						}
 					};
 
-				if (deviceData.type === 'mobile') {
+				if (deviceData && deviceData.type === 'mobile') {
 					monster.ui.confirm(
 						self.i18n.active().users.confirmMobileUnAssignment.replace(
 							'{{variable}}',