diff --git a/app/Http/Controllers/ActionlogController.php b/app/Http/Controllers/ActionlogController.php index 8d45aebe19..ba14a7914e 100644 --- a/app/Http/Controllers/ActionlogController.php +++ b/app/Http/Controllers/ActionlogController.php @@ -3,10 +3,12 @@ namespace App\Http\Controllers; use App\Helpers\Helper; +use App\Models\Actionlog; use Response; class ActionlogController extends Controller { + public function displaySig($filename) { $this->authorize('view', \App\Models\Asset::class); @@ -16,12 +18,4 @@ class ActionlogController extends Controller return Response::make($contents)->header('Content-Type', $filetype); } - - public function getStoredEula($filename){ - $this->authorize('view', \App\Models\Asset::class); - $file = config('app'.$filename); - - - return Response::download($file); - } } diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 76e1f9e13f..4ad8bfb26d 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1093,12 +1093,12 @@ {{ trans('general.item') }} {{ trans('general.target') }} {{ trans('general.notes') }} - {{ trans('general.accept_eula') }} + {{ trans('general.accept_eula') }} {{ trans('general.download') }} {{ trans('admin/hardware/table.changed')}} - @foreach($action_logs as $log) + @foreach($asset->assetlog as $log) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 88b9584542..082ea2a9d5 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -7,6 +7,7 @@