From efe60ebc58654910bd0d4492c0df1dc24cb1e684 Mon Sep 17 00:00:00 2001 From: atm-lena Date: Wed, 26 Aug 2020 17:02:34 +0200 Subject: [PATCH] Error management --- htdocs/comm/action/card.php | 11 ++++++++++- htdocs/langs/en_US/main.lang | 1 + htdocs/langs/fr_FR/main.lang | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 5465e00887a..d783af604b7 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -387,7 +387,7 @@ if (empty($reshook) && $action == 'add') $moreparam = ''; if ($user->id != $object->userownerid) $moreparam = "filtert=-1"; // We force to remove filter so created record is visible when going back to per user view. - //Reminder + //Create eminder if($addreminder == 'on'){ $actionCommReminder = new ActionCommReminder($db); @@ -416,6 +416,15 @@ if (empty($reshook) && $action == 'add') if($remindertype == 'email') $actionCommReminder->fk_email_template = $modelmail; $res = $actionCommReminder->create($user); + + if($res <= 0){ + // If error + $db->rollback(); + $langs->load("errors"); + $error = $langs->trans('ErrorReminderActionCommCreation'); + setEventMessages($error, null, 'errors'); + $action = 'create'; $donotclearsession = 1; + } } $db->commit(); diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 186272da1b6..0203f2e7af2 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1082,3 +1082,4 @@ MODIFYInDolibarr=Record %s modified DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved +ErrorReminderActionCommCreation=Error creating the reminder notification for this event \ No newline at end of file diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 1d5dd9bc6cb..aaadd7e31fe 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -1043,4 +1043,4 @@ AmountMustBePositive=Le montant doit être positif. ByStatus=Par statut InformationMessage=Information ASAP=Dès que possible - +ErrorReminderActionCommCreation=Erreur lors de la création de la notification de rappel de cet événement