Add a common function to delete the linked contact

This commit is contained in:
Regis Houssin 2010-04-30 05:51:23 +00:00
parent ff0bbd1c43
commit a9eb2a9da9
2 changed files with 28 additions and 0 deletions

View File

@ -354,8 +354,23 @@ class Project extends CommonObject
function delete($user, $notrigger=0) function delete($user, $notrigger=0)
{ {
global $conf; global $conf;
$error=0;
$this->db->begin(); $this->db->begin();
if (! $error)
{
// Delete linked contacts
$res = $this->delete_linked_contact();
if ($res < 0)
{
$this->error='ErrorFailToDeleteLinkedContact';
//$error++;
$this->db->rollback();
return 0;
}
}
$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet";
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;

View File

@ -320,6 +320,19 @@ class Task extends CommonObject
$this->db->rollback(); $this->db->rollback();
return 0; return 0;
} }
if (! $error)
{
// Delete linked contacts
$res = $this->delete_linked_contact();
if ($res < 0)
{
$this->error='ErrorFailToDeleteLinkedContact';
//$error++;
$this->db->rollback();
return 0;
}
}
$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task"; $sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task";
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;