Skip to content

Commit 02da777

Browse files
committed
enhance reservation log messages
1 parent 88069df commit 02da777

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

front/reservation.form.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,22 @@
9595
$_POST['begin'] = $_POST['resa']["begin"];
9696
$_POST['end'] = $_POST['resa']["end"];
9797
if ($rr->update($_POST)) {
98+
$rri = new ReservationItem();
99+
$rri->getFromDB($_POST['_item']);
100+
$item = getItemForItemtype($rri->fields["itemtype"]);
101+
$item->getFromDB($rri->fields["items_id"]);
98102
Event::log(
99103
$_POST["id"],
100104
"reservation",
101105
4,
102106
"inventory",
103107
//TRANS: %s is the user login
104108
sprintf(
105-
__('%1$s updates the reservation for item %2$s'),
109+
__('%1$s updates reservation %2$s for %3$s %4$s'),
106110
$_SESSION["glpiname"],
107-
$_POST['_item']
111+
$_POST['id'],
112+
$item::getTypeName(1),
113+
$item->getNameID(['forceid' => true])
108114
)
109115
);
110116
}
@@ -114,16 +120,22 @@
114120

115121
$reservationitems_id = key($_POST["items"]);
116122
if ($rr->delete($_POST, true)) {
123+
$rri = new ReservationItem();
124+
$rri->getFromDB($reservationitems_id);
125+
$item = getItemForItemtype($rri->fields["itemtype"]);
126+
$item->getFromDB($rri->fields["items_id"]);
117127
Event::log(
118128
$_POST["id"],
119129
"reservation",
120130
4,
121131
"inventory",
122132
//TRANS: %s is the user login
123133
sprintf(
124-
__('%1$s purges the reservation for item %2$s'),
134+
__('%1$s purges reservation %2$s for %3$s %4$s'),
125135
$_SESSION["glpiname"],
126-
$reservationitems_id
136+
$_POST['id'],
137+
$item::getTypeName(1),
138+
$item->getNameID(['forceid' => true])
127139
)
128140
);
129141
}

src/Reservation.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,24 +222,24 @@ public static function handleAddForm(array $input): void
222222
}
223223

224224
if ($newID = $rr->add($reservation_input)) {
225+
$rri = new ReservationItem();
226+
$rri->getFromDB($reservationitems_id);
227+
$item = getItemForItemtype($rri->fields["itemtype"]);
228+
$item->getFromDB($rri->fields["items_id"]);
229+
225230
Event::log(
226231
$newID,
227232
"reservation",
228233
4,
229234
"inventory",
230235
sprintf(
231-
__s('%1$s adds the reservation %2$s for item %3$s'),
236+
__s('%1$s adds reservation %2$s for %3$s %4$s'),
232237
$_SESSION["glpiname"],
233238
$newID,
234-
$reservationitems_id
239+
$item::getTypeName(1),
240+
$item->getNameID(['forceid' => true])
235241
)
236242
);
237-
238-
$rri = new ReservationItem();
239-
$rri->getFromDB($reservationitems_id);
240-
$item = getItemForItemtype($rri->fields["itemtype"]);
241-
$item->getFromDB($rri->fields["items_id"]);
242-
243243
Session::addMessageAfterRedirect(
244244
sprintf(
245245
__s('Reservation added for item %s at %s'),

0 commit comments

Comments
 (0)