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

Update commonobject.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2020-06-06 21:30:08 +02:00 committed by GitHub
parent 0943b13ecc
commit a66926cf08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/core/class/commonobject.class.php
View File

@ -7970,7 +7970,8 @@ abstract class CommonObject
} }
/** /**
* Delete all child object * Delete all child object from a parent ID
*
* @param int $parentId Parent Id * @param int $parentId Parent Id
* @param string $parentField Name of Foreign key parent column * @param string $parentField Name of Foreign key parent column
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
@ -7988,7 +7989,7 @@ abstract class CommonObject
$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $this->table_element; $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $this->table_element;
$sql .= ' WHERE '.$parentField.' = ' . $parentId; $sql .= ' WHERE '.$parentField.' = ' . $parentId;
dol_syslog(__METHOD__, LOG_DEBUG);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if (!$resql) { if (!$resql) {
$this->errors[] = $this->db->lasterror(); $this->errors[] = $this->db->lasterror();
@ -8000,21 +8001,7 @@ abstract class CommonObject
$error++; $error++;
$this->errors[] = $this->error; $this->errors[] = $this->error;
} else { } else {
$needUserParam = false; $result = $this->delete($user);
if (class_exists('ReflectionMethod')) {
$method = new ReflectionMethod($this, 'delete');
$argsMethod=$method->getParameters();
if (is_array($argsMethod) && count($argsMethod)>0) {
if ($argsMethod[0]->name == 'user') {
$needUserParam = true;
}
}
}
if ($needUserParam) {
$result = $this->delete($user);
} else {
$result = $this->delete();
}
if ($result < 0) { if ($result < 0) {
$error++; $error++;
$this->errors[] = $this->error; $this->errors[] = $this->error;
@ -8029,7 +8016,7 @@ abstract class CommonObject
$this->db->commit(); $this->db->commit();
return $deleted; return $deleted;
} else { } else {
$this->error = implode(' ', $this->errors); $this->error = implode(', ', $this->errors);
$this->db->rollback(); $this->db->rollback();
return $error * -1; return $error * -1;
} }