diff --git a/app/Http/Transformers/ActionlogsTransformer.php b/app/Http/Transformers/ActionlogsTransformer.php index 12f89de2b..3a095e891 100644 --- a/app/Http/Transformers/ActionlogsTransformer.php +++ b/app/Http/Transformers/ActionlogsTransformer.php @@ -55,25 +55,35 @@ class ActionlogsTransformer } } + $url = ''; + if($actionlog->filename!='') { + if ($actionlog->present()->actionType() == 'accepted') { + $url = route('log.storedeula.download', ['filename' => $actionlog->filename]); + } else { + if ($actionlog->itemType() == 'asset') { + $url = route('show/assetfile', ['assetId' => $actionlog->id, 'fileId' => $actionlog->id]); + } elseif ($actionlog->itemType() == 'license') { + $url = route('show.licensefile', ['licenseId' => $actionlog->item->id, 'fileId' => $actionlog->id]); + } elseif ($actionlog->itemType() == 'user') { + $url = route('show/userfile', ['userId' => $actionlog->item->id, 'fileId' => $actionlog->id]); + } + } + } - $array = [ + $array = [ 'id' => (int) $actionlog->id, 'icon' => $icon, 'file' => ($actionlog->filename!='') ? [ - 'url' => ($actionlog->present()->actionType()=='accepted') - ? - route('log.storedeula.download', ['filename' => $actionlog->filename]) - : - route('show/assetfile', ['assetId' => $actionlog->id, 'fileId' => $actionlog->id]), + 'url' => $url, 'filename' => $actionlog->filename, 'inlineable' => (bool) Helper::show_file_inline($actionlog->filename), ] : null, 'item' => ($actionlog->item) ? [ 'id' => (int) $actionlog->item->id, - 'name' => ($actionlog->itemType()=='user') ? $actionlog->filename : e($actionlog->item->getDisplayNameAttribute()), + 'name' => ($actionlog->itemType()=='user') ? e($actionlog->item->getFullNameAttribute()) : e($actionlog->item->getDisplayNameAttribute()), 'type' => e($actionlog->itemType()), ] : null, 'location' => ($actionlog->location) ? [ @@ -104,6 +114,7 @@ class ActionlogsTransformer ]; //\Log::info("Clean Meta is: ".print_r($clean_meta,true)); + //dd($array); return $array; } diff --git a/resources/views/reports/activity.blade.php b/resources/views/reports/activity.blade.php index 1b54e7851..931ba654c 100644 --- a/resources/views/reports/activity.blade.php +++ b/resources/views/reports/activity.blade.php @@ -47,6 +47,7 @@ {{ trans('general.date') }} {{ trans('general.admin') }} {{ trans('general.action') }} + {{ trans('general.file_name') }} {{ trans('general.type') }} {{ trans('general.item') }} {{ trans('general.to') }}