Skip to content

Commit

Permalink
Better error management in delete project method
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian HENRY committed May 7, 2014
1 parent e6708a5 commit 3f22bc7
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions htdocs/projet/class/project.class.php
Expand Up @@ -533,28 +533,31 @@ function delete($user, $notrigger=0)
$res = @dol_delete_dir_recursive($dir);
if (!$res)
{
$this->error = 'ErrorFailToDeleteDir';
$this->db->rollback();
return 0;
$this->errors[] = 'ErrorFailToDeleteDir';
$error++;
}
}
}

if (!$notrigger)
{
// Call triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface = new Interfaces($this->db);
$result = $interface->run_triggers('PROJECT_DELETE', $this, $user, $langs, $conf);
if ($result < 0)
{
$error++;
$this->errors = $interface->errors;
}
// End call triggers
// Call triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface = new Interfaces($this->db);
$result = $interface->run_triggers('PROJECT_DELETE', $this, $user, $langs, $conf);
if ($result < 0)
{
$error++;
foreach ($interface->errors as $errmsg ) {
dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);
$this->errors[] =$errmsg;
}
}
// End call triggers
}

dol_syslog(get_class($this) . "::delete sql=" . $sql, LOG_DEBUG);
}

if (empty($error)) {
$this->db->commit();
return 1;
}
Expand Down

0 comments on commit 3f22bc7

Please sign in to comment.