lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Do not report trigger errors twice.

Browse Source 
Fix: Error when creating event was not reported.
This commit is contained in:
Laurent Destailleur 2014-02-14 12:54:04 +01:00
parent ead7df3306
commit 3e3c541e4c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/action/fiche.php
View File

@ -226,7 +226,7 @@ if ($action == 'add_action')
// On cree l'action // On cree l'action
$idaction=$object->add($user); $idaction=$object->add($user);
if ($idaction > 0) if ($idaction > 0)
{ {
if (! $object->error) if (! $object->error)
@ -261,8 +261,8 @@ if ($action == 'add_action')
{ {
$db->rollback(); $db->rollback();
$langs->load("errors"); $langs->load("errors");
$error=$langs->trans($object->error); if (! empty($object->error)) setEventMessage($langs->trans($object->error), 'errors');
setEventMessage($error,'errors'); if (count($object->errors)) setEventMessage($object->errors, 'errors');
$action = 'create'; $action = 'create';
} }
} }

2
htdocs/core/class/interfaces.class.php
View File

@ -167,8 +167,8 @@ class Interfaces
// Action KO // Action KO
$nbtotal++; $nbtotal++;
$nbko++; $nbko++;
if (! empty($objMod->error)) $this->errors[]=$objMod->error;
if (! empty($objMod->errors)) $this->errors=array_merge($this->errors,$objMod->errors); if (! empty($objMod->errors)) $this->errors=array_merge($this->errors,$objMod->errors);
else if (! empty($objMod->error)) $this->errors[]=$objMod->error;
} }
} }
else else