mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-06 00:53:00 +01:00
QUAL: Removed deprecated properties user_valid, user->creation,
user_modification replaced with user_ceation_id, user_validation_id and user_modification_id.
This commit is contained in:
@@ -185,8 +185,8 @@ function dol_print_object_info($object, $usetable = 0)
|
||||
}
|
||||
}
|
||||
|
||||
// Creation (old method using already loaded object and not id is kept for backward compatibility)
|
||||
if (!empty($object->user_creation) || !empty($object->user_creation_id) || !empty($object->date_creation)) {
|
||||
// Creation
|
||||
if (!empty($object->user_creation_id) || !empty($object->date_creation)) {
|
||||
if ($usetable) {
|
||||
print '<tr><td class="titlefield">';
|
||||
}
|
||||
@@ -196,23 +196,15 @@ function dol_print_object_info($object, $usetable = 0)
|
||||
} else {
|
||||
print ': ';
|
||||
}
|
||||
if (! empty($object->user_creation) && is_object($object->user_creation)) { // deprecated mode
|
||||
if ($object->user_creation->id) {
|
||||
print $object->user_creation->getNomUrl(-1, '', 0, 0, 0);
|
||||
} else {
|
||||
print $langs->trans("Unknown");
|
||||
}
|
||||
$userstatic = new User($db);
|
||||
$userstatic->fetch($object->user_creation_id);
|
||||
if ($userstatic->id) {
|
||||
print $userstatic->getNomUrl(-1, '', 0, 0, 0);
|
||||
} else {
|
||||
$userstatic = new User($db);
|
||||
$userstatic->fetch($object->user_creation_id);
|
||||
if ($userstatic->id) {
|
||||
print $userstatic->getNomUrl(-1, '', 0, 0, 0);
|
||||
} else {
|
||||
print $langs->trans("Unknown");
|
||||
}
|
||||
print $langs->trans("Unknown");
|
||||
}
|
||||
|
||||
if ((!empty($object->user_creation) || !empty($object->user_creation_id)) && !empty($object->date_creation)) {
|
||||
if (!empty($object->user_creation_id) && !empty($object->date_creation)) {
|
||||
print ' - ';
|
||||
}
|
||||
|
||||
@@ -232,8 +224,8 @@ function dol_print_object_info($object, $usetable = 0)
|
||||
}
|
||||
}
|
||||
|
||||
// Last modification (old method using already loaded object and not id is kept for backward compatibility)
|
||||
if (!empty($object->user_modification) || !empty($object->user_modification_id) || !empty($object->date_modification)) {
|
||||
// Last modification
|
||||
if (!empty($object->user_modification_id) || !empty($object->date_modification)) {
|
||||
if ($usetable) {
|
||||
print '<tr><td class="titlefield">';
|
||||
}
|
||||
@@ -244,20 +236,12 @@ function dol_print_object_info($object, $usetable = 0)
|
||||
print ': ';
|
||||
}
|
||||
print '<div class="valignmiddle inline-block">';
|
||||
if (is_object($object->user_modification)) {
|
||||
if ($object->user_modification->id) {
|
||||
print $object->user_modification->getNomUrl(-1, '', 0, 0, 0);
|
||||
} else {
|
||||
print $langs->trans("Unknown");
|
||||
}
|
||||
$userstatic = new User($db);
|
||||
$userstatic->fetch($object->user_modification_id);
|
||||
if ($userstatic->id) {
|
||||
print $userstatic->getNomUrl(-1, '', 0, 0, 0);
|
||||
} else {
|
||||
$userstatic = new User($db);
|
||||
$userstatic->fetch($object->user_modification_id);
|
||||
if ($userstatic->id) {
|
||||
print $userstatic->getNomUrl(-1, '', 0, 0, 0);
|
||||
} else {
|
||||
print $langs->trans("Unknown");
|
||||
}
|
||||
print $langs->trans("Unknown");
|
||||
}
|
||||
print '</div>';
|
||||
|
||||
@@ -278,8 +262,8 @@ function dol_print_object_info($object, $usetable = 0)
|
||||
}
|
||||
}
|
||||
|
||||
// Validation (old method using already loaded object and not id is kept for backward compatibility)
|
||||
if (!empty($object->user_validation) || !empty($object->user_validation_id) || !empty($object->date_validation)) {
|
||||
// Validation
|
||||
if (!empty($object->user_validation_id) || !empty($object->date_validation)) {
|
||||
if ($usetable) {
|
||||
print '<tr><td class="titlefield">';
|
||||
}
|
||||
@@ -289,20 +273,12 @@ function dol_print_object_info($object, $usetable = 0)
|
||||
} else {
|
||||
print ': ';
|
||||
}
|
||||
if (is_object($object->user_validation)) {
|
||||
if ($object->user_validation->id) {
|
||||
print $object->user_validation->getNomUrl(-1, '', 0, 0, 0);
|
||||
} else {
|
||||
print $langs->trans("Unknown");
|
||||
}
|
||||
$userstatic = new User($db);
|
||||
$userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
|
||||
if ($userstatic->id) {
|
||||
print $userstatic->getNomUrl(-1, '', 0, 0, 0);
|
||||
} else {
|
||||
$userstatic = new User($db);
|
||||
$userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
|
||||
if ($userstatic->id) {
|
||||
print $userstatic->getNomUrl(-1, '', 0, 0, 0);
|
||||
} else {
|
||||
print $langs->trans("Unknown");
|
||||
}
|
||||
print $langs->trans("Unknown");
|
||||
}
|
||||
|
||||
if (!empty($object->date_validation)) {
|
||||
|
||||
Reference in New Issue
Block a user