DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-10-31 15:33:50 +00:00
parent e862fe1056 9a7e7bddcc
commit e703bfaa21
2 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/Http/Controllers/SettingsController.php
View file

@ -26,7 +26,7 @@ use Response;
use App\Http\Requests\SlackSettingsRequest; use App\Http\Requests\SlackSettingsRequest;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Artisan;
use Validator; use Illuminate\Support\Facades\Validator;
/** /**
* This controller handles all actions related to Settings for * This controller handles all actions related to Settings for
@ -1248,13 +1248,11 @@ class SettingsController extends Controller
if (!$request->hasFile('file')) { if (!$request->hasFile('file')) {
return redirect()->route('settings.backups.index')->with('error', 'No file uploaded'); return redirect()->route('settings.backups.index')->with('error', 'No file uploaded');
} else { } else {
$max_file_size = Helper::file_upload_max_size(); $max_file_size = Helper::file_upload_max_size();
$validator = Validator::make($request->all(), [
$rules = [
'file' => 'required|mimes:zip|max:'.$max_file_size, 'file' => 'required|mimes:zip|max:'.$max_file_size,
]; ]);
$validator = \Validator::make($request->all(), $rules);
if ($validator->passes()) { if ($validator->passes()) {
@ -1265,7 +1263,7 @@ class SettingsController extends Controller
return redirect()->route('settings.backups.index')->with('success', 'File uploaded'); return redirect()->route('settings.backups.index')->with('success', 'File uploaded');
} }
return redirect()->route('settings.backups.index')->withErrors($request->getErrors()); return redirect()->route('settings.backups.index')->withErrors($validator);
} }

12
resources/views/settings/backups.blade.php
View file

@ -137,7 +137,7 @@
@csrf @csrf
<div class="form-group {{ $errors->has((isset($fieldname) ? $fieldname : 'image')) ? 'has-error' : '' }}" style="margin-bottom: 0px;"> <div class="form-group {{ $errors->has((isset($fieldname) ? $fieldname : 'file')) ? 'has-error' : '' }}" style="margin-bottom: 0px;">
<div class="col-md-8 col-xs-8"> <div class="col-md-8 col-xs-8">
@ -145,25 +145,17 @@
<label class="btn btn-default col-md-12 col-xs-12" aria-hidden="true"> <label class="btn btn-default col-md-12 col-xs-12" aria-hidden="true">
<i class="fas fa-paperclip" aria-hidden="true"></i> <i class="fas fa-paperclip" aria-hidden="true"></i>
{{ trans('button.select_file') }} {{ trans('button.select_file') }}
<input type="file" name="file" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="application/zip" style="display:none;" aria-label="file" aria-hidden="true"> <input type="file" name="file" class="js-uploadFile" id="uploadFile" data-maxsize="{{ Helper::file_upload_max_size() }}" accept="application/zip" style="display:none;" aria-label="file" aria-hidden="true">
</label> </label>
</div> </div>
<div class="col-md-4 col-xs-4"> <div class="col-md-4 col-xs-4">
<button class="btn btn-primary col-md-12 col-xs-12" id="uploadButton" disabled>{{ trans('button.upload') }} <span id="uploadIcon"></span></button> <button class="btn btn-primary col-md-12 col-xs-12" id="uploadButton" disabled>{{ trans('button.upload') }} <span id="uploadIcon"></span></button>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<p class="label label-default col-md-12" style="font-size: 120%!important; margin-top: 10px; margin-bottom: 10px;" id="uploadFile-info"></p> <p class="label label-default col-md-12" style="font-size: 120%!important; margin-top: 10px; margin-bottom: 10px;" id="uploadFile-info"></p>
<p class="help-block" style="margin-top: 10px;" id="uploadFile-status">{{ trans_choice('general.filetypes_accepted_help', 1, ['size' => Helper::file_upload_max_size_readable(), 'types' => '.zip']) }}</p> <p class="help-block" style="margin-top: 10px;" id="uploadFile-status">{{ trans_choice('general.filetypes_accepted_help', 1, ['size' => Helper::file_upload_max_size_readable(), 'types' => '.zip']) }}</p>
{!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!} {!! $errors->first('file', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
</div> </div>