DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-01-23 15:36:05 -08:00
parent 2564da648b 35dfaddd79
commit 4c7b731acc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/ImportController.php
View file

@ -127,7 +127,7 @@ class ImportController extends Controller
$this->authorize('import'); $this->authorize('import');
// Run a backup immediately before processing // Run a backup immediately before processing
if ($request->has('run-backup')) { if ($request->get('run-backup')) {
\Log::debug('Backup manually requested via importer'); \Log::debug('Backup manually requested via importer');
Artisan::call('backup:run'); Artisan::call('backup:run');
} else { } else {

2
resources/views/livewire/custom-field-set-default-values-for-model.blade.php
View file

@ -13,7 +13,7 @@
</div> </div>
</div> </div>
@if ($this->add_default_values ) {{-- 'if the checkbox is enabled *AND* there are more than 0 fields in the fieldsset' --}} @if ($this->add_default_values ) {{-- 'if the checkbox is enabled *AND* there are more than 0 fields in the fieldsset' --}}
<div> <div style="padding-left: 10px; padding-bottom: 0px; margin-bottom: -15px;">
<div class="form-group"> <div class="form-group">
@if ($fields) @if ($fields)
@foreach ($fields as $field) @foreach ($fields as $field)