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

Merge pull request #8385 from ATM-Nicolas/fix_project_delete_task

Browse Source 
FIX : Delete tasks on project delete will now trigger TASK_DELETE
This commit is contained in:
Laurent Destailleur 2018-03-15 00:39:18 +01:00 committed by GitHub
commit f3be6045f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -629,45 +629,13 @@ class Project extends CommonObject
} }
} }
// Delete tasks // Fetch tasks
if (! $error) $this->getLinesArray($user);
{
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_time";
$sql.= " WHERE fk_task IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
$resql = $this->db->query($sql); // Delete tasks
if (!$resql) foreach($this->lines as &$task) {
{ $task->delete($user);
$this->errors[] = $this->db->lasterror(); }
$error++;
}
}
if (! $error)
{
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task_extrafields";
$sql.= " WHERE fk_object IN (SELECT rowid FROM " . MAIN_DB_PREFIX . "projet_task WHERE fk_projet=" . $this->id . ")";
$resql = $this->db->query($sql);
if (!$resql)
{
$this->errors[] = $this->db->lasterror();
$error++;
}
}
if (! $error)
{
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "projet_task";
$sql.= " WHERE fk_projet=" . $this->id;
$resql = $this->db->query($sql);
if (!$resql)
{
$this->errors[] = $this->db->lasterror();
$error++;
}
}
// Delete project // Delete project
if (! $error) if (! $error)