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

Merge branch 'develop' into chore/migrate-label-helpers-pt7

Browse source
This commit is contained in:
snipe 2025-02-06 10:03:42 +00:00 committed by GitHub
parent b39b24e6b9 46dd83c34e
commit 1233c939f8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/views/locations/print.blade.php
View file

@ -126,7 +126,7 @@
@foreach ($assets as $asset)
@php
if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus->archived == 1){
if($snipeSettings->show_archived_in_list != 1 && $asset->assetstatus?->archived == 1){
continue;
}
@endphp

2
resources/views/setup/user.blade.php
View file

@ -125,7 +125,7 @@
<!-- email-->
<div class="form-group col-lg-6{{ $errors->has('email') ? 'error' : '' }}">
<label for="email">{{ trans('admin/users/table.email') }}</label>
{{ Form::email('email', config('mail.from.address'), array('class' => 'form-control','placeholder' => 'you@example.com', 'required' => true)) }}
<input class="form-control" type="email" name="email" id="email" value="{{ old('email', config('mail.from.address')) }}" placeholder="you@example.com" required>
{!! $errors->first('email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>