DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-07-09 19:52:20 +01:00
parent ea881ff95e 1a1ccd6bdc
commit 18f7ca860d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/ActionlogController.php
View file

@ -7,6 +7,7 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use \Illuminate\Http\Response; use \Illuminate\Http\Response;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
class ActionlogController extends Controller class ActionlogController extends Controller
{ {
public function displaySig($filename) : RedirectResponse | Response | bool public function displaySig($filename) : RedirectResponse | Response | bool
@ -36,7 +37,7 @@ class ActionlogController extends Controller
} }
} }
public function getStoredEula($filename) : Response public function getStoredEula($filename) : Response | BinaryFileResponse
{ {
$this->authorize('view', \App\Models\Asset::class); $this->authorize('view', \App\Models\Asset::class);
$file = config('app.private_uploads').'/eula-pdfs/'.$filename; $file = config('app.private_uploads').'/eula-pdfs/'.$filename;