svc-admin01/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2026-06-12 22:04:38 +01:00
parent 6769424aa2 bccba46332
commit 31cf7ba6b5
2 changed files with 57 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Requests/FilterRequest.php
+40
View File
@@ -2,9 +2,20 @@
namespace App\Http\Requests;
use App\Models\Accessory;
use App\Models\Asset;
use App\Models\AssetModel;
use App\Models\Component;
use App\Models\Consumable;
use App\Models\License;
use App\Models\LicenseSeat;
use App\Models\Location;
use App\Models\Maintenance;
use App\Models\User;
use App\Rules\ValidJson;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class FilterRequest extends FormRequest
{
@@ -23,8 +34,37 @@ class FilterRequest extends FormRequest
*/
public function rules(): array
{
$allowedTypes = [
'accessory',
Accessory::class,
'asset',
Asset::class,
'assetmodel',
'assetModel',
'AssetModel',
AssetModel::class,
'component',
Component::class,
'consumable',
Consumable::class,
'license',
License::class,
'licenseseat',
'licenseSeat',
'LicenseSeat',
LicenseSeat::class,
'location',
Location::class,
'maintenance',
Maintenance::class,
'user',
User::class,
];
return [
'filter' => ['nullable', new ValidJson],
'item_type' => ['nullable', Rule::in($allowedTypes)],
'target_type' => ['nullable', Rule::in($allowedTypes)],
];
}
}
resources/views/livewire/importer.blade.php
+17 -8
View File
@@ -39,16 +39,25 @@
<tbody>
@foreach($import_errors AS $key => $actual_import_errors)
@foreach($actual_import_errors AS $table => $error_bag)
@foreach($error_bag as $field => $error_list)
{{-- general messages such as "The selected file is invalid" are simple strings --}}
@if(is_string($error_bag))
<tr>
<td><b>{{ $key }}</b></td>
<td><b>{{ $field }}</b></td>
<td>
<span>{{ implode(", ",$error_list) }}</span>
<br />
</td>
<td></td>
<td></td>
<td>{{ $error_bag }}</td>
</tr>
@endforeach
@elseif(is_array($error_bag))
@foreach($error_bag as $field => $error_list)
<tr>
<td><b>{{ $key }}</b></td>
<td><b>{{ $field }}</b></td>
<td>
<span>{{ implode(", ",$error_list) }}</span>
<br />
</td>
</tr>
@endforeach
@endif
@endforeach
@endforeach
</tbody>