[5.1] MSCO-23: Include Device name and remove brand and model from de…

…vice (#57)

app.js

@@ -18,7 +18,7 @@ define(function(require) {
 			csvOnboarding: {
 				columns: {
 					userMandatory: ['first_name', 'last_name', 'password', 'email', 'extension'],
-					mandatory: ['first_name', 'last_name', 'password', 'email', 'extension', 'mac_address', 'brand', 'family', 'model'],
+					mandatory: ['first_name', 'last_name', 'password', 'email', 'extension', 'mac_address', 'brand', 'family', 'model', 'device_name'],
 					optional: ['notification_email']
 				},
 				users: {
@@ -1129,7 +1129,7 @@ define(function(require) {
 						device_type: 'sip_device',
 						enabled: true,
 						mac_address: data.mac_address,
-						name: data.first_name + ' ' + data.last_name + ' - ' + data.brand + ' ' + data.model,
+						name: data.device_name,
 						provision: {
 							endpoint_brand: data.brand,
 							endpoint_family: data.family,

i18n/en-US.json

@@ -14,7 +14,7 @@
 			"mainTitleUsers": "Fast SmartPBX Onboarding - Add User",
 			"mainTitleUsersDevices": "Fast SmartPBX Onboarding - Add User & Device",
 			"subTitleUsers": "Upload a CSV File with the following columns: first_name, last_name, password, email, extension, notification_email",
-			"subTitleUsersDevices": "Upload a CSV file with the following columns: first_name, last_name, password, email, extension, notification_email, mac_address, brand, family, model.",
+			"subTitleUsersDevices": "Upload a CSV file with the following columns: first_name, last_name, password, email, extension, notification_email, mac_address, brand, family, model, device_name.",
 			"constrainUsers": "A Header row is <strong>required.</strong> The email and extension values <strong>must be unique.</strong> Notification email is <strong>optional.</strong>",
 			"constrainUsersDevices": "A Header row is <strong>required.</strong> The email, extension, and mac_address values <strong>must be unique.</strong> Notification email is <strong>optional.</strong><br/> You are not able to adjust a device's brand, family, or model information without deleteing and recreating a device, so please ensure your information is accurate.",
 			"text": "Drag and drop your file here to upload, or browse your computer.",