Merge remote-tracking branch 'origin/develop'

This commit is contained in:
snipe
2025-12-11 16:01:15 +00:00

View File

@@ -125,7 +125,8 @@
<tr style="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? 'font-weight: bold' : '' }}" class="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? '' : '' }}">
<td>
@if ((auth()->user()->id == $currentFile->adminuser->id) || (auth()->user()->isSuperUser()))
@if ((auth()->user()->id == $currentFile->adminuser?->id) || (auth()->user()->isSuperUser()))
<a href="{{ route('imports.download', $currentFile) }}">{{ $currentFile->file_path }}</a>
@else
{{ $currentFile->file_path }}
@@ -150,6 +151,7 @@
<i class="fa-solid fa-list-check" aria-hidden="true"></i>
<span class="sr-only">{{ trans('general.import') }}</span>
</button>
@if ((auth()->user()->id == $currentFile->adminuser->id) || (auth()->user()->isSuperUser()))
<a href="#" wire:click.prevent="$set('activeFileId',null)" data-tooltip="true" data-title="{{ trans('general.delete') }}">
<button class="btn btn-sm btn-danger" wire:click="destroy({{ $currentFile->id }})">