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

Merge pull request #13787 from inietov/fixes/errorexception_undefined_array_key

Browse source 
Fixed ErrorException: Undefined array key in importer blade [sc-23864]
This commit is contained in:
snipe 2023-10-25 07:47:48 +01:00 committed by GitHub
parent 4d345168d6 f2f3931fa9
commit 8c93e79397
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
resources/lang/en/help.php
View file

@ -30,5 +30,6 @@ return [
'consumables' => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.', 'consumables' => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', 'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
'empty_file' => 'The importer detects that this file is empty.'
]; ];

7
resources/views/livewire/importer.blade.php
View file

@ -235,9 +235,16 @@
]) ])
}} }}
</div> </div>
@if ($activeFile->first_row)
<div class="col-md-5"> <div class="col-md-5">
<p class="form-control-static">{{ str_limit($activeFile->first_row[$index], 50, '...') }}</p> <p class="form-control-static">{{ str_limit($activeFile->first_row[$index], 50, '...') }}</p>
</div> </div>
@else
@php
$statusText = trans('help.empty_file');
$statusType = 'info';
@endphp
@endif
</div><!-- /div row --> </div><!-- /div row -->
@endforeach @endforeach
@else @else