From eb83941e6166fca55a8c67b11e37c42edc7d126c Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Fri, 4 Sep 2020 10:46:05 +0200
Subject: [PATCH] NEW manage errors on update extra fields in ticket card

---
 htdocs/ticket/card.php | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index d5da98b4a84..50b675d49fe 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -127,6 +127,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
+$error = 0;
 if (empty($reshook)) {
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers{
@@ -157,6 +158,8 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")), null, 'errors');
 			$action = 'create';
 		}
+		$ret = $extrafields->setOptionalsFromPost(null, $object);
+		if ($ret < 0)	$error++;
 
 		if (!$error) {
 			$db->begin();
@@ -174,12 +177,10 @@ if (empty($reshook)) {
 
 			$object->fk_project = GETPOST('projectid', 'int');
 
-			$ret = $extrafields->setOptionalsFromPost(null, $object);
-
 			$id = $object->create($user);
 			if ($id <= 0) {
 				$error++;
-				setEventMessage($object->error, $object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 				$action = 'create';
 			}
 
@@ -560,18 +561,22 @@ if (empty($reshook)) {
 	// Action to update one extrafield
 	if ($action == "update_extras" && !empty($permissiontoadd)) {
 		$object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha'));
-		$attributekey = GETPOST('attribute', 'alpha');
-		$attributekeylong = 'options_' . $attributekey;
-		$object->array_options['options_' . $attributekey] = GETPOST($attributekeylong, ' alpha');
 
-		$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
-		if ($result > 0) {
-			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			$action = 'view';
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = 'edit_extras';
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'none'));
+		if ($ret < 0) $error++;
+
+		if (!$error) {
+			$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
+			if ($result > 0) {
+				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+				$action = 'view';
+			} else {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		}
+
+		if ($error) $action = 'edit_extras';
 	}
 
 	if ($action == "change_property" && GETPOST('btn_update_ticket_prop', 'alpha') && $user->rights->ticket->write) {