DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12473 from inietov/fixes/rollbar_attempt_to_read_property_on_null

Browse source 
Fixed ErrorException:  Attempt to read property "id" on null [sc-19855]
This commit is contained in:
snipe 2023-02-15 12:32:53 -08:00 committed by GitHub
parent 7980e2ab2e d4c838a979
commit 057f0be20a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Transformers/ActionlogsTransformer.php
View file

@ -60,6 +60,7 @@ class ActionlogsTransformer
if ($actionlog->action_type == 'accepted') {
$file_url = route('log.storedeula.download', ['filename' => $actionlog->filename]);
} else {
if ($actionlog->item) {
if ($actionlog->itemType() == 'asset') {
$file_url = route('show/assetfile', ['assetId' => $actionlog->item->id, 'fileId' => $actionlog->id]);
} elseif ($actionlog->itemType() == 'license') {
@ -69,6 +70,7 @@ class ActionlogsTransformer
}
}
}
}
$array = [
'id' => (int) $actionlog->id,