mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-04 16:15:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2025-12-08 19:33:07 +00:00
parent bcbf27acca fa5dd99f00
commit ed837b7527
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/ObjectImportCommand.php
View File

@ -56,7 +56,7 @@ class ObjectImportCommand extends Command
$this->progressIndicator = new ProgressIndicator($this->output);
$filename = $this->argument('filename');
$class = title_case($this->option('item-type'));
$class = ucfirst($this->option('item-type'));
$classString = "App\\Importer\\{$class}Importer";
$importer = new $classString($filename);
$importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])

2
resources/views/account/view-assets.blade.php
View File

@ -530,7 +530,7 @@
</td>
<td>
<x-icon type="circle-solid" class="text-blue" />
{{ $asset->assetstatus->name }}
{{ $asset->assetstatus?->name }}
<label class="label label-default">{{ trans('general.deployed') }}</label>
</td>
<td>