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

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-11-14 17:45:01 +00:00
parent 23cbee9493 15da39d44a
commit 8d03ce5e2c
4 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.env.example
View file

@ -174,3 +174,9 @@ REPORT_TIME_LIMIT=12000
REQUIRE_SAML=false REQUIRE_SAML=false
API_THROTTLE_PER_MINUTE=120 API_THROTTLE_PER_MINUTE=120
CSV_ESCAPE_FORMULAS=true CSV_ESCAPE_FORMULAS=true
# --------------------------------------------
# OPTIONAL: SCIM
# --------------------------------------------
SCIM_TRACE=false
SCIM_STANDARDS_COMPLIANCE=false

8
composer.lock generated
View file

@ -78,12 +78,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/grokability/laravel-scim-server.git", "url": "https://github.com/grokability/laravel-scim-server.git",
"reference": "9e7a8fd51a7380bc18ca1f01256574d75a2c6b49" "reference": "8eba81d36a32077ab45ef60290cad817d07b6224"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/9e7a8fd51a7380bc18ca1f01256574d75a2c6b49", "url": "https://api.github.com/repos/grokability/laravel-scim-server/zipball/8eba81d36a32077ab45ef60290cad817d07b6224",
"reference": "9e7a8fd51a7380bc18ca1f01256574d75a2c6b49", "reference": "8eba81d36a32077ab45ef60290cad817d07b6224",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -133,7 +133,7 @@
"support": { "support": {
"source": "https://github.com/grokability/laravel-scim-server/tree/master" "source": "https://github.com/grokability/laravel-scim-server/tree/master"
}, },
"time": "2022-10-06T00:42:37+00:00" "time": "2022-11-09T17:01:45+00:00"
}, },
{ {
"name": "asm89/stack-cors", "name": "asm89/stack-cors",

4
config/scim.php
View file

@ -1,6 +1,8 @@
<?php <?php
return [ return [
"trace" => env("SCIM_TRACE",false),
// below, if we ever get 'sure' that we can change this default to 'true' we should
"standards_compliance" => env('SCIM_STANDARDS_COMPLIANCE', false),
"publish_routes" => false, "publish_routes" => false,
"trace" => env("SCIM_TRACE",false)
]; ];

12
resources/views/licenses/view.blade.php
View file

@ -463,16 +463,20 @@
</td> </td>
<td> <td>
@if ($file->filename) @if ($file->filename)
@if ( Helper::checkUploadIsImage($file->get_src('licenses'))) @if ((Storage::exists('private_uploads/licenses/'.$file->filename)) && ( Helper::checkUploadIsImage($file->get_src('licenses'))))
<a href="{{ route('show.licensefile', ['licenseId' => $license->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.licensefile', ['licenseId' => $license->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a> <a href="{{ route('show.licensefile', ['licenseId' => $license->id, 'fileId' => $file->id, 'download' => 'false']) }}" data-toggle="lightbox" data-type="image"><img src="{{ route('show.licensefile', ['licenseId' => $license->id, 'fileId' => $file->id]) }}" class="img-thumbnail" style="max-width: 50px;"></a>
@endif @endif
@endif @endif
</td> </td>
<td> <td>
{{ $file->filename }} @if (Storage::exists('private_uploads/licenses/'.$file->filename))
{{ $file->filename }}
@else
<del>{{ $file->filename }}</del>
@endif
</td> </td>
<td data-value="{{ Storage::size('private_uploads/licenses/'.$file->filename) }}"> <td data-value="{{ (Storage::exists('private_uploads/licenses/'.$file->filename)) ? Storage::size('private_uploads/licenses/'.$file->filename) : '' }}">
{{ Helper::formatFilesizeUnits(Storage::size('private_uploads/licenses/'.$file->filename)) }} {{ (Storage::exists('private_uploads/licenses/'.$file->filename)) ? Helper::formatFilesizeUnits(Storage::size('private_uploads/licenses/'.$file->filename)) : '' }}
</td> </td>
<td> <td>