Skip to content

Commit

Permalink
fix links in event list
Browse files Browse the repository at this point in the history
fixes #6274
  • Loading branch information
cconard96 authored and trasher committed Oct 2, 2019
1 parent 7dabe27 commit 4371de6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion inc/consumable.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBT
$ma->addMessage($item->getErrorMessage(ERROR_RIGHT));
}
}
Event::log($item->fields['consumableitems_id'], "consumables", 5, "inventory",
Event::log($item->fields['consumableitems_id'], "consumableitems", 5, "inventory",
//TRANS: %s is the user login
sprintf(__('%s gives a consumable'), $_SESSION["glpiname"]));
} else {
Expand Down
4 changes: 2 additions & 2 deletions inc/event.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@ static function displayItemLogID($type, $items_id) {
$type = getSingular($type);
$url = '';
if ($item = getItemForItemtype($type)) {
$url = $item->getFormURL();
$url = $item->getFormURLWithID($items_id);
}
if (!empty($url)) {
echo "<a href=\"".$url."?id=".$items_id."\">".$items_id."</a>";
echo "<a href=\"".$url."\">".$items_id."</a>";
} else {
echo $items_id;
}
Expand Down

0 comments on commit 4371de6

Please sign in to comment.