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-29 12:38:40 +01:00
parent c7c3243bbc 577b5586b4
commit 53ce44ac91
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
resources/views/reports/custom.blade.php
View File

@@ -736,52 +736,69 @@
clearBtn: true,
todayHighlight: true,
endDate: '0d',
format: 'yyyy-mm-dd'
format: 'yyyy-mm-dd',
keepEmptyValues: true,
});
$('.created-range .input-daterange').datepicker({
clearBtn: true,
todayHighlight: true,
endDate: '0d',
format: 'yyyy-mm-dd',
keepEmptyValues: true,
});
$('.checkout-range .input-daterange').datepicker({
clearBtn: true,
todayHighlight: true,
endDate: '0d',
format: 'yyyy-mm-dd'
format: 'yyyy-mm-dd',
keepEmptyValues: true,
});
$('.checkin-range .input-daterange').datepicker({
clearBtn: true,
todayHighlight: true,
endDate: '0d',
format: 'yyyy-mm-dd'
format: 'yyyy-mm-dd',
keepEmptyValues: true,
});
$('.expected_checkin-range .input-daterange').datepicker({
clearBtn: true,
todayHighlight: true,
format: 'yyyy-mm-dd'
format: 'yyyy-mm-dd',
keepEmptyValues: true,
});
$('.asset_eol_date-range .input-daterange').datepicker({
clearBtn: true,
todayHighlight: true,
format: 'yyyy-mm-dd'
format: 'yyyy-mm-dd',
keepEmptyValues: true,
});
$('.last_audit-range .input-daterange').datepicker({
clearBtn: true,
todayHighlight: true,
endDate:'0d',
format: 'yyyy-mm-dd'
format: 'yyyy-mm-dd',
keepEmptyValues: true,
});
$('.next_audit-range .input-daterange').datepicker({
clearBtn: true,
todayHighlight: true,
format: 'yyyy-mm-dd'
format: 'yyyy-mm-dd',
keepEmptyValues: true,
});
$('.last_updated-range .input-daterange').datepicker({
clearBtn: true,
todayHighlight: true,
endDate:'0d',
format: 'yyyy-mm-dd'
format: 'yyyy-mm-dd',
keepEmptyValues: true,
});

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

@@ -98,7 +98,7 @@
<!-- email format -->
<div class="form-group col-lg-6 {{ $errors->has('email_format') ? 'error' : '' }}">
<label for="email_format">{{ trans('general.email_format') }}</label>
<label for="email_format">{{ trans('admin/settings/general.email_formats.email_format') }}</label>
{!! Form::username_format('email_format', old('email_format', 'filastname'), 'select2') !!}
{!! $errors->first('email_format', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div>