ouyang/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
2025-05-13 20:44:34 +02:00
parent 95cc4d3a73 6b56929a06
commit 62b16339a9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Labels/Sheets/Avery/L7162_B.php
View File

@@ -55,7 +55,7 @@ class L7162_B extends L7162
$pdf, $record->get('logo'),
$pa->x1, $pa->y1,
self::LOGO_MAX_WIDTH, $usableHeight,
'L', 'T', 300, true, false, 0.1
'L', 'T', 300, true, false, 0
);
$currentX += $logoSize[0] + self::LOGO_MARGIN;
$usableWidth -= $logoSize[0] + self::LOGO_MARGIN;
@@ -100,4 +100,4 @@ class L7162_B extends L7162
}
?>
?>

2
app/Models/User.php
View File

@@ -320,7 +320,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
{
$setting = Setting::getSettings();
if ($setting->name_display_format=='last_first') {
if ($setting?->name_display_format == 'last_first') {
return ($this->last_name) ? $this->last_name.' '.$this->first_name : $this->first_name;
}
return $this->last_name ? $this->first_name.' '.$this->last_name : $this->first_name;

2
resources/views/accessories/view.blade.php
View File

@@ -324,7 +324,7 @@
</strong>
</div>
<div class="col-md-9" style="word-wrap: break-word;">
{{ $accessory->adminuser->present()->fullName() }}
{{ $accessory->adminuser?->present()->fullName() }}
</div>
</div>