DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed stored_eula_file from API transformer

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2022-05-17 07:01:33 -07:00
parent ebd3c11129
commit 8e85d316c9
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,9 +59,14 @@ class ActionlogsTransformer
$array = [ $array = [
'id' => (int) $actionlog->id, 'id' => (int) $actionlog->id,
'icon' => $icon, 'icon' => $icon,
'file' => ($actionlog->filename!='') ? 'file' => ($actionlog->filename!='')
?
[ [
'url' => route('show/assetfile', ['assetId' => $actionlog->item->id, 'fileId' => $actionlog->id]), 'url' => ($actionlog->present()->actionType()=='accepted')
?
route('log.storedeula.download', ['filename' => $actionlog->filename])
:
route('show/assetfile', ['assetId' => $actionlog->id, 'fileId' => $actionlog->id]),
'filename' => $actionlog->filename, 'filename' => $actionlog->filename,
'inlineable' => (bool) Helper::show_file_inline($actionlog->filename), 'inlineable' => (bool) Helper::show_file_inline($actionlog->filename),
] : null, ] : null,
@ -96,7 +101,6 @@ class ActionlogsTransformer
'signature_file' => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null, 'signature_file' => ($actionlog->accept_signature) ? route('log.signature.view', ['filename' => $actionlog->accept_signature ]) : null,
'log_meta' => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null, 'log_meta' => ((isset($clean_meta)) && (is_array($clean_meta))) ? $clean_meta: null,
'action_date' => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'), 'action_date' => ($actionlog->action_date) ? Helper::getFormattedDateObject($actionlog->action_date, 'datetime'): Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),
'stored_eula_file' => ($actionlog->stored_eula_file) ? route('log.storedeula.download', ['filename' => $actionlog->stored_eula_file]) : null,
]; ];
//\Log::info("Clean Meta is: ".print_r($clean_meta,true)); //\Log::info("Clean Meta is: ".print_r($clean_meta,true));