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

Update project.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2018-08-21 13:09:06 +02:00 committed by GitHub
parent ba6f7d4b0a
commit 3523c2b3d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -712,21 +712,22 @@ class Project extends CommonObject
} }
/** /**
* Reoder tasks to delete children tasks first * Delete tasks with no children first, then task with children recursively
* *
* @param array $arr Array of tasks * @param int <0 if KO, 1 if OK
*/ */
function deleteTasks($user) function deleteTasks($user)
{ {
$countTasks = count($this->lines); $countTasks = count($this->lines);
$deleted = false; $deleted = false;
if ($countTasks){ if ($countTasks)
{
foreach($this->lines as $task) foreach($this->lines as $task)
{ {
if($task->hasChildren() <= 0) { if ($task->hasChildren() <= 0) { // If there is no children (or error to detect them)
$deleted = true; $deleted = true;
$ret = $task->delete($user); $ret = $task->delete($user);
if ($ret < 1) if ($ret <= 0)
{ {
$this->errors[] = $this->db->lasterror(); $this->errors[] = $this->db->lasterror();
return -1; return -1;
@ -735,7 +736,7 @@ class Project extends CommonObject
} }
} }
$this->getLinesArray($user); $this->getLinesArray($user);
if($deleted && count($this->lines) < $countTasks) if ($deleted && count($this->lines) < $countTasks)
{ {
if (count($this->lines)) $this->deleteTasks($this->lines); if (count($this->lines)) $this->deleteTasks($this->lines);
} }