From 9f923c135ceaabf5edf1118d37882a10c1521bbe Mon Sep 17 00:00:00 2001
From: Ricardo Merino <masmerino@gmail.com>
Date: Mon, 7 Jan 2019 10:33:56 -0600
Subject: [PATCH] UI-3269-fixes: Fix form submit and improve device form
 validations (#112)

* Move buttons aout to prevent form submit

* Add device form validations
---
 submodules/users/users.js            | 22 ++++++++++++++++------
 submodules/users/views/creation.html | 15 +++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/submodules/users/users.js b/submodules/users/users.js
index 389c39e..632b255 100644
--- a/submodules/users/users.js
+++ b/submodules/users/users.js
@@ -1775,6 +1775,12 @@ define(function(require) {
 							},
 							'user.password': {
 								minlength: 6
+							},
+							'user.device.name': 'required',
+							'user.device.model': 'required',
+							'user.device.mac_address': {
+								required: true,
+								mac: true
 							}
 						},
 						messages: {
@@ -1786,6 +1792,15 @@ define(function(require) {
 							},
 							'callflow.extension': {
 								required: self.i18n.active().validation.required
+							},
+							'user.device.model': {
+								required: self.i18n.active().validation.required
+							},
+							'user.device.name': {
+								required: self.i18n.active().validation.required
+							},
+							'user.device.mac_address': {
+								required: self.i18n.active().validation.required
 							}
 						}
 					};
@@ -3834,12 +3849,7 @@ define(function(require) {
 
 			delete formattedData.user.extra;
 
-			if (
-				_.get(data, 'user.device.brand', 'none') === 'none'
-				&& _.get(data, 'user.device.model', 'none') === 'none'
-				&& _.isEmpty(_.get(data, 'user.device.name'))
-				&& _.isEmpty(_.get(data, 'user.device.mac_address'))
-				) {
+			if (_.get(data, 'user.device.brand', 'none') === 'none') {
 				delete formattedData.user.device;
 				return formattedData;
 			}
diff --git a/submodules/users/views/creation.html b/submodules/users/views/creation.html
index bfd8e74..845a802 100644
--- a/submodules/users/views/creation.html
+++ b/submodules/users/views/creation.html
@@ -121,16 +121,15 @@
 			</div>
 			<div class="span6 device-mac to-right">
 				<label for="mac_address" class="control-label">{{ i18n.users.dialogCreationUser.addDevice.macAddress }}</label>
-				<input required type="text" id="mac_address" name="user.device.mac_address" placeholder="19:33:1A:B2:12:58">
-			</div>
-		</div>
-
-		<div>
-			<div class="dialog-buttons-wrapper add-user-actions">
-				<button class="monster-button monster-button-success create_user">{{ i18n.users.dialogCreationUser.createUser }}</button>
-				<button class="monster-button monster-button-success create_user" data-action="add_new">{{ i18n.users.dialogCreationUser.createUserAndAddAnother }}</button>
+				<input type="text" id="mac_address" name="user.device.mac_address" placeholder="19:33:1A:B2:12:58">
 			</div>
 		</div>
 	</form>
+	<div>
+		<div class="dialog-buttons-wrapper add-user-actions">
+			<button class="monster-button monster-button-success create_user">{{ i18n.users.dialogCreationUser.createUser }}</button>
+			<button class="monster-button monster-button-success create_user" data-action="add_new">{{ i18n.users.dialogCreationUser.createUserAndAddAnother }}</button>
+		</div>
+	</div>
 </div>