pass $user to delete functions

This commit is contained in:
Cédric 2020-08-08 22:14:53 +02:00 committed by GitHub
parent e73a7c78f7
commit ef57bb7e84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -90,9 +90,9 @@ if ($confirm == 'yes') {
if ($action == 'confirm_delete') { if ($action == 'confirm_delete') {
$db->begin(); $db->begin();
$res = $objectval->deleteByFkAttribute($object->id); $res = $objectval->deleteByFkAttribute($object->id, $user);
if ($res < 1 || ($object->delete() < 1)) { if ($res < 1 || ($object->delete($user) < 1)) {
$db->rollback(); $db->rollback();
setEventMessages($langs->trans('CoreErrorMessage'), $object->errors, 'errors'); setEventMessages($langs->trans('CoreErrorMessage'), $object->errors, 'errors');
header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2)); header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2));
@ -105,7 +105,7 @@ if ($confirm == 'yes') {
} elseif ($action == 'confirm_deletevalue') } elseif ($action == 'confirm_deletevalue')
{ {
if ($objectval->fetch($valueid) > 0) { if ($objectval->fetch($valueid) > 0) {
if ($objectval->delete() < 1) { if ($objectval->delete($user) < 1) {
setEventMessages($langs->trans('CoreErrorMessage'), $objectval->errors, 'errors'); setEventMessages($langs->trans('CoreErrorMessage'), $objectval->errors, 'errors');
} else { } else {
setEventMessages($langs->trans('RecordSaved'), null, 'mesgs'); setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');