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

Fixes some errors in forms using the deprecated Input:: facade

Browse source
This commit is contained in:
Ivan Nieto 2020-09-03 13:42:33 -05:00
parent ed79eacb9d
commit 3fcd83c499
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Assets/AssetsController.php
View file

@ -565,7 +565,7 @@ class AssetsController extends Controller
if (!ini_get("auto_detect_line_endings")) { if (!ini_get("auto_detect_line_endings")) {
ini_set("auto_detect_line_endings", '1'); ini_set("auto_detect_line_endings", '1');
} }
$csv = Reader::createFromPath(Input::file('user_import_csv')); $csv = Reader::createFromPath($request->file('user_import_csv'));
$csv->setHeaderOffset(0); $csv->setHeaderOffset(0);
$results = $csv->getRecords(); $results = $csv->getRecords();
$item = array(); $item = array();

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

@ -186,7 +186,7 @@ class SettingsController extends Controller
Auth::login($user, true); Auth::login($user, true);
$settings->save(); $settings->save();
if ('1' == Input::get('email_creds')) { if ('1' == get('email_creds')) {
$data = []; $data = [];
$data['email'] = $user->email; $data['email'] = $user->email;
$data['username'] = $user->username; $data['username'] = $user->username;
@ -347,7 +347,7 @@ class SettingsController extends Controller
$setting->depreciation_method = $request->input('depreciation_method'); $setting->depreciation_method = $request->input('depreciation_method');
if ('' != Input::get('per_page')) { if ('' != get('per_page')) {
$setting->per_page = $request->input('per_page'); $setting->per_page = $request->input('per_page');
} else { } else {
$setting->per_page = 200; $setting->per_page = 200;
@ -1146,10 +1146,10 @@ class SettingsController extends Controller
* *
* @return View * @return View
*/ */
public function postPurge() public function postPurge(Request $request)
{ {
if (! config('app.lock_passwords')) { if (! config('app.lock_passwords')) {
if ('DELETE' == Input::get('confirm_purge')) { if ('DELETE' == $request->get('confirm_purge')) {
// Run a backup immediately before processing // Run a backup immediately before processing
Artisan::call('backup:run'); Artisan::call('backup:run');
Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]); Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);

4
resources/views/hardware/bulk.blade.php
View file

@ -33,7 +33,7 @@
<label for="purchase_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.date') }}</label> <label for="purchase_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.date') }}</label>
<div class="input-group col-md-3"> <div class="input-group col-md-3">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true"> <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date') }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ old('purchase_date') }}">
<span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span> <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
</div> </div>
{!! $errors->first('purchase_date', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('purchase_date', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@ -44,7 +44,7 @@
<label for="expected_checkin" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label> <label for="expected_checkin" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
<div class="input-group col-md-3"> <div class="input-group col-md-3">
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true"> <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true">
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}"> <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
<span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span> <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
</div> </div>
{!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}