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

Better error management in delete project method

Browse Source
This commit is contained in:
Florian HENRY 2014-05-07 15:08:44 +02:00
parent e6708a5072
commit 3f22bc7009
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
htdocs/projet/class/project.class.php
View File

@ -533,28 +533,31 @@ class Project extends CommonObject
$res = @dol_delete_dir_recursive($dir); $res = @dol_delete_dir_recursive($dir);
if (!$res) if (!$res)
{ {
$this->error = 'ErrorFailToDeleteDir'; $this->errors[] = 'ErrorFailToDeleteDir';
$this->db->rollback(); $error++;
return 0;
} }
} }
} }
if (!$notrigger) if (!$notrigger)
{ {
// Call triggers // Call triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface = new Interfaces($this->db); $interface = new Interfaces($this->db);
$result = $interface->run_triggers('PROJECT_DELETE', $this, $user, $langs, $conf); $result = $interface->run_triggers('PROJECT_DELETE', $this, $user, $langs, $conf);
if ($result < 0) if ($result < 0)
{ {
$error++; $error++;
$this->errors = $interface->errors; foreach ($interface->errors as $errmsg ) {
} dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
// End call triggers $this->errors[] =$errmsg;
}
}
// End call triggers
} }
}
dol_syslog(get_class($this) . "::delete sql=" . $sql, LOG_DEBUG); if (empty($error)) {
$this->db->commit(); $this->db->commit();
return 1; return 1;
} }