From cb71bcc4afe28cc5fe6d30ac2a6604c5b6169537 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 21 Apr 2020 03:58:31 -0700 Subject: [PATCH] Switch to old() helper --- .../Controllers/Assets/AssetsController.php | 122 +++++------------- resources/views/accessories/checkin.blade.php | 2 +- .../views/accessories/checkout.blade.php | 2 +- resources/views/account/profile.blade.php | 12 +- .../views/asset_maintenances/edit.blade.php | 10 +- resources/views/categories/edit.blade.php | 4 +- resources/views/components/checkin.blade.php | 4 +- resources/views/components/checkout.blade.php | 2 +- .../views/consumables/checkout.blade.php | 2 +- .../views/custom_fields/fields/edit.blade.php | 12 +- .../custom_fields/fieldsets/edit.blade.php | 2 +- .../custom_fields/fieldsets/view.blade.php | 2 +- resources/views/groups/edit.blade.php | 2 +- resources/views/hardware/audit.blade.php | 4 +- .../views/hardware/bulk-checkout.blade.php | 6 +- resources/views/hardware/bulk.blade.php | 14 +- resources/views/hardware/checkin.blade.php | 4 +- resources/views/hardware/checkout.blade.php | 8 +- resources/views/hardware/quickscan.blade.php | 4 +- resources/views/licenses/checkin.blade.php | 2 +- resources/views/licenses/checkout.blade.php | 2 +- resources/views/licenses/edit.blade.php | 16 +-- resources/views/locations/edit.blade.php | 6 +- resources/views/manufacturers/edit.blade.php | 10 +- resources/views/modals/upload-file.blade.php | 2 +- resources/views/models/bulk-edit.blade.php | 4 +- .../views/models/custom_fields_form.blade.php | 2 +- resources/views/models/edit.blade.php | 4 +- .../partials/forms/edit/address.blade.php | 12 +- .../forms/edit/asset-select.blade.php | 2 +- .../forms/edit/category-select.blade.php | 2 +- .../partials/forms/edit/category.blade.php | 2 +- .../forms/edit/company-select.blade.php | 2 +- .../partials/forms/edit/company.blade.php | 2 +- .../forms/edit/department-select.blade.php | 2 +- .../forms/edit/depreciation.blade.php | 2 +- .../views/partials/forms/edit/email.blade.php | 2 +- .../partials/forms/edit/item_number.blade.php | 2 +- .../edit/location-profile-select.blade.php | 2 +- .../forms/edit/location-select.blade.php | 2 +- .../partials/forms/edit/location.blade.php | 2 +- .../forms/edit/maintenance_type.blade.php | 2 +- .../forms/edit/manufacturer-select.blade.php | 2 +- .../forms/edit/manufacturer.blade.php | 2 +- .../forms/edit/minimum_quantity.blade.php | 2 +- .../forms/edit/model-select.blade.php | 2 +- .../forms/edit/model_number.blade.php | 2 +- .../views/partials/forms/edit/name.blade.php | 2 +- .../views/partials/forms/edit/notes.blade.php | 2 +- .../forms/edit/order_number.blade.php | 2 +- .../views/partials/forms/edit/phone.blade.php | 2 +- .../forms/edit/purchase_cost.blade.php | 2 +- .../forms/edit/purchase_date.blade.php | 2 +- .../partials/forms/edit/quantity.blade.php | 2 +- .../partials/forms/edit/serial.blade.php | 2 +- .../partials/forms/edit/status.blade.php | 2 +- .../forms/edit/supplier-select.blade.php | 2 +- .../partials/forms/edit/supplier.blade.php | 2 +- .../partials/forms/edit/user-select.blade.php | 2 +- resources/views/reports/custom.blade.php | 2 +- resources/views/settings/alerts.blade.php | 8 +- resources/views/settings/asset_tags.blade.php | 10 +- resources/views/settings/barcodes.blade.php | 8 +- resources/views/settings/branding.blade.php | 16 +-- resources/views/settings/general.blade.php | 26 ++-- resources/views/settings/labels.blade.php | 34 ++--- .../views/settings/localization.blade.php | 2 +- resources/views/settings/security.blade.php | 16 +-- resources/views/setup/user.blade.php | 8 +- resources/views/suppliers/edit.blade.php | 6 +- resources/views/users/bulk-edit.blade.php | 6 +- resources/views/users/edit.blade.php | 22 ++-- webpack.mix.js | 1 - 73 files changed, 221 insertions(+), 282 deletions(-) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 9feecbd640..bf8ca1c93d 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -119,7 +119,7 @@ class AssetsController extends Controller $asset = new Asset(); $asset->model()->associate(AssetModel::find($request->input('model_id'))); $asset->name = $request->input('name'); - + // Check for a corresponding serial if (($serials) && (array_key_exists($a, $serials))) { $asset->serial = $serials[$a]; @@ -154,27 +154,26 @@ class AssetsController extends Controller $asset->location_id = $request->input('rtd_location_id', null); } - // Create the image (if one was chosen.) - if ($request->has('image')) { - $asset = $request->handleImages($asset); - } + // Create the image (if one was chosen.) + if ($request->has('image')) { + $asset = $request->handleImages($asset); + } + // Update custom fields in the database. + // Validation for these fields is handled through the AssetRequest form request + $model = AssetModel::find($request->get('model_id')); - // Update custom fields in the database. - // Validation for these fields is handled through the AssetRequest form request - $model = AssetModel::find($request->get('model_id')); - - if (($model) && ($model->fieldset)) { - foreach ($model->fieldset->fields as $field) { - if ($field->field_encrypted=='1') { - if (Gate::allows('admin')) { - $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt($request->input($field->convertUnicodeDbSlug())); + if (($model) && ($model->fieldset)) { + foreach ($model->fieldset->fields as $field) { + if ($field->field_encrypted=='1') { + if (Gate::allows('admin')) { + $asset->{$field->convertUnicodeDbSlug()} = \Crypt::encrypt($request->input($field->convertUnicodeDbSlug())); + } + } else { + $asset->{$field->convertUnicodeDbSlug()} = $request->input($field->convertUnicodeDbSlug()); } - } else { - $asset->{$field->convertUnicodeDbSlug()} = $request->input($field->convertUnicodeDbSlug()); } } - } // Validate the asset before saving if ($asset->isValid() && $asset->save()) { @@ -202,8 +201,6 @@ class AssetsController extends Controller } if ($success) { - $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name')), $location); - } // Redirect to the asset listing page return redirect()->route('hardware.index') ->with('success', trans('admin/hardware/message.create.success')); @@ -317,7 +314,7 @@ class AssetsController extends Controller unlink(public_path().'/uploads/assets/'.$asset->image); $asset->image = ''; } catch (\Exception $e) { - \Log::debug($e); + \Log::info($e); } } @@ -356,18 +353,6 @@ class AssetsController extends Controller if ($asset->save()) { - - // Update any assigned assets with the new location_id from the parent asset - - Asset::where('assigned_type', '\\App\\Models\\Asset')->where('assigned_to', $asset->id) - ->update(['location_id' => $asset->location_id]); - - // Redirect to the new asset page - \Session::flash('success', trans('admin/hardware/message.update.success')); - return response()->json(['redirect_url' => route("hardware.show", $assetId)]); - } - \Input::flash(); - \Session::flash('errors', $asset->getErrors()); return redirect()->route("hardware.show", $assetId) ->with('success', trans('admin/hardware/message.update.success')); } @@ -413,63 +398,22 @@ class AssetsController extends Controller /** - * Searches the assets table by tag, and redirects if it finds one. - * - * This is used by the top search box in Snipe-IT, but as of 4.9.x - * can also be used as a url segment. - * - * https://yoursnipe.com/hardware/bytag/?assetTag=foo - * - * OR - * - * https://yoursnipe.com/hardware/bytag/foo - * - * The latter is useful if you're doing home-grown barcodes, or - * some other automation where you don't always know the internal ID of - * an asset and don't want to query for it. + * Searches the assets table by asset tag, and redirects if it finds one * * @author [A. Gianotto] [] - * @param string $tag * @since [v3.0] * @return Redirect */ - public function getAssetByTag(Request $request, $tag = null) + public function getAssetByTag(Request $request) { - $topsearch = ($request->get('topsearch')=="true"); - // We need this part to determine whether a url query parameter has been passed, OR - // whether it's the url fragment we need to look at - $tag = ($request->get('assetTag')) ? $request->get('assetTag') : $tag; - - if (!$asset = Asset::where('asset_tag', '=', $tag)->first()) { + if (!$asset = Asset::where('asset_tag', '=', $request->get('assetTag'))->first()) { return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); } $this->authorize('view', $asset); return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch); } - - - /** - * Searches the assets table by serial, and redirects if it finds one - * - * @author [A. Gianotto] [] - * @param string $serial - * @since [v4.9.1] - * @return Redirect - */ - public function getAssetBySerial(Request $request, $serial = null) - { - - $serial = ($request->get('serial')) ? $request->get('serial') : $serial; - if (!$asset = Asset::where('serial', '=', $serial)->first()) { - return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); - } - $this->authorize('view', $asset); - return redirect()->route('hardware.show', $asset->id); - } - - /** * Return a QR code for the asset * @@ -520,7 +464,6 @@ class AssetsController extends Controller $barcode_file = public_path().'/uploads/barcodes/'.str_slug($settings->alt_barcode).'-'.str_slug($asset->asset_tag).'.png'; if (isset($asset->id, $asset->asset_tag)) { - if (file_exists($barcode_file)) { $header = ['Content-type' => 'image/png']; return response()->file($barcode_file, $header); @@ -529,14 +472,14 @@ class AssetsController extends Controller $barcode_width = ($settings->labels_width - $settings->labels_display_sgutter) * 96.000000000001; $barcode = new \Com\Tecnick\Barcode\Barcode(); + $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode,$asset->asset_tag,($barcode_width < 300 ? $barcode_width : 300),50); - try { + file_put_contents($barcode_file, $barcode_obj->getPngData()); return response($barcode_obj->getPngData())->header('Content-type', 'image/png'); } } } - $barcode_obj = $barcode->getBarcodeObj($settings->alt_barcode,$asset->asset_tag,($barcode_width < 300 ? $barcode_width : 300),50); /** * Return a label for an individual asset. @@ -545,25 +488,21 @@ class AssetsController extends Controller * @param int $assetId * @return View */ - file_put_contents($barcode_file, $barcode_obj->getPngData()); + public function getLabel($assetId = null) { if (isset($assetId)) { $asset = Asset::find($assetId); - return response($barcode_obj->getPngData())->header('Content-type', 'image/png'); - - + $this->authorize('view', $asset); + return view('hardware/labels') + ->with('assets', Asset::find($asset)) ->with('settings', Setting::getSettings()) - \Log::debug('This usually happens because the asset tags are of a format that is not compatible with the selected barcode type.'); - $img = file_get_contents(public_path().'/uploads/barcodes/invalid_barcode.gif'); - return response($img)->header('Content-type', 'image/gif'); - } - - - } + ->with('bulkedit', false) + ->with('count', 0); } } + /** * Returns a view that presents a form to clone an asset. * @@ -844,6 +783,7 @@ class AssetsController extends Controller Storage::putFileAs($path, $upload, $file_name); } + $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name); return redirect()->to("hardware")->with('success', trans('admin/hardware/message.audit.success')); } @@ -862,4 +802,4 @@ class AssetsController extends Controller return view('hardware/requested', compact('requestedItems')); } -} +} \ No newline at end of file diff --git a/resources/views/accessories/checkin.blade.php b/resources/views/accessories/checkin.blade.php index d908fe571d..79105b6b6e 100755 --- a/resources/views/accessories/checkin.blade.php +++ b/resources/views/accessories/checkin.blade.php @@ -48,7 +48,7 @@
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php index 801c79c415..695f31b608 100755 --- a/resources/views/accessories/checkout.blade.php +++ b/resources/views/accessories/checkout.blade.php @@ -83,7 +83,7 @@
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php index 6b562e75bc..59c7cb64e3 100755 --- a/resources/views/account/profile.blade.php +++ b/resources/views/account/profile.blade.php @@ -20,7 +20,7 @@
- + {!! $errors->first('first_name', '') !!}
@@ -31,7 +31,7 @@ {{ trans('general.last_name') }}
- + {!! $errors->first('last_name', '') !!}
@@ -49,7 +49,7 @@
@if (!config('app.lock_passwords')) - {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} + {!! Form::locales('locale', old('locale', $user->locale), 'select2') !!} {!! $errors->first('locale', '') !!} @else

{{ trans('general.feature_disabled') }}

@@ -62,7 +62,7 @@
- + {!! $errors->first('phone', '') !!}
@@ -73,7 +73,7 @@
- + {!! $errors->first('website', '') !!}
@@ -84,7 +84,7 @@ (Private)
- + {!! $errors->first('gravatar', '') !!}

{{ $user->present()->fullName() }} avatar image diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/asset_maintenances/edit.blade.php index df82f56d85..40440e5617 100644 --- a/resources/views/asset_maintenances/edit.blade.php +++ b/resources/views/asset_maintenances/edit.blade.php @@ -51,7 +51,7 @@ {{ trans('admin/asset_maintenances/form.title') }}

- + {!! $errors->first('title', '') !!}
@@ -62,7 +62,7 @@
- +
{!! $errors->first('start_date', '') !!} @@ -77,7 +77,7 @@
- +
{!! $errors->first('completion_date', '') !!} @@ -107,7 +107,7 @@ {{ $snipeSettings->default_currency }} @endif - + {!! $errors->first('cost', '') !!}
@@ -117,7 +117,7 @@
- + {!! $errors->first('notes', '') !!}
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php index b217a879f8..611023cd45 100755 --- a/resources/views/categories/edit.blade.php +++ b/resources/views/categories/edit.blade.php @@ -14,7 +14,7 @@
- {{ Form::select('category_type', $category_types , Input::old('category_type', $item->category_type), array('class'=>'select2', 'style'=>'min-width:350px', 'aria-label'=>'category_type', $item->itemCount() > 0 ? 'disabled' : '')) }} + {{ Form::select('category_type', $category_types , old('category_type', $item->category_type), array('class'=>'select2', 'style'=>'min-width:350px', 'aria-label'=>'category_type', $item->itemCount() > 0 ? 'disabled' : '')) }} {!! $errors->first('category_type', '') !!}
@@ -23,7 +23,7 @@
- {{ Form::textarea('eula_text', Input::old('eula_text', $item->eula_text), array('class' => 'form-control', 'aria-label'=>'eula_text')) }} + {{ Form::textarea('eula_text', old('eula_text', $item->eula_text), array('class' => 'form-control', 'aria-label'=>'eula_text')) }}

{!! trans('admin/categories/general.eula_text_help') !!}

{!! trans('admin/settings/general.eula_markdown') !!}

diff --git a/resources/views/components/checkin.blade.php b/resources/views/components/checkin.blade.php index bb7095b7f6..4dfb104103 100644 --- a/resources/views/components/checkin.blade.php +++ b/resources/views/components/checkin.blade.php @@ -39,7 +39,7 @@
- +

Must be {{ $component_assets->assigned_qty }} or less.

@@ -52,7 +52,7 @@
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.php index 67e092eada..d1338f4f8c 100644 --- a/resources/views/components/checkout.blade.php +++ b/resources/views/components/checkout.blade.php @@ -42,7 +42,7 @@
- + {!! $errors->first('assigned_qty', '
') !!}
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php index 94ec45c85c..de96f9c859 100644 --- a/resources/views/consumables/checkout.blade.php +++ b/resources/views/consumables/checkout.blade.php @@ -70,7 +70,7 @@
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php index 40fc1f69f4..e3e4bd1151 100644 --- a/resources/views/custom_fields/fields/edit.blade.php +++ b/resources/views/custom_fields/fields/edit.blade.php @@ -39,7 +39,7 @@ {{ trans('admin/custom_fields/general.field_name') }}
- {{ Form::text('name', Input::old('name', $field->name), array('class' => 'form-control', 'aria-label'=>'name')) }} + {{ Form::text('name', old('name', $field->name), array('class' => 'form-control', 'aria-label'=>'name')) }} {!! $errors->first('name', '') !!}
@@ -51,7 +51,7 @@
- {!! Form::customfield_elements('element', Input::old('element', $field->element), 'field_element select2 form-control') !!} + {!! Form::customfield_elements('element', old('element', $field->element), 'field_element select2 form-control') !!} {!! $errors->first('element', '') !!}
@@ -63,7 +63,7 @@ {{ trans('admin/custom_fields/general.field_values') }}
- {!! Form::textarea('field_values', Input::old('name', $field->field_values), ['style' => 'width: 100%', 'rows' => 4, 'class' => 'form-control', 'aria-label'=>'field_values']) !!} + {!! Form::textarea('field_values', old('name', $field->field_values), ['style' => 'width: 100%', 'rows' => 4, 'class' => 'form-control', 'aria-label'=>'field_values']) !!} {!! $errors->first('field_values', '') !!}

{{ trans('admin/custom_fields/general.field_values_help') }}

@@ -86,7 +86,7 @@ {{ trans('admin/custom_fields/general.field_custom_format') }}
- {{ Form::text('custom_format', Input::old('custom_format', (($field->format!='') && (stripos($field->format,'regex')===0)) ? $field->format : ''), array('class' => 'form-control', 'id' => 'custom_format','aria-label'=>'custom_format', 'placeholder'=>'regex:/^[0-9]{15}$/')) }} + {{ Form::text('custom_format', old('custom_format', (($field->format!='') && (stripos($field->format,'regex')===0)) ? $field->format : ''), array('class' => 'form-control', 'id' => 'custom_format','aria-label'=>'custom_format', 'placeholder'=>'regex:/^[0-9]{15}$/')) }}

{!! trans('admin/custom_fields/general.field_custom_format_help') !!}

{!! $errors->first('custom_format', '') !!} @@ -100,7 +100,7 @@ Help Text
- {{ Form::text('help_text', Input::old('help_text', $field->help_text), array('class' => 'form-control', 'aria-label'=>'help_text')) }} + {{ Form::text('help_text', old('help_text', $field->help_text), array('class' => 'form-control', 'aria-label'=>'help_text')) }}

This is optional text that will appear below the form elements while editing an asset to provide context on the field.

{!! $errors->first('help_text', '') !!}
@@ -110,7 +110,7 @@
diff --git a/resources/views/custom_fields/fieldsets/edit.blade.php b/resources/views/custom_fields/fieldsets/edit.blade.php index 562813e301..6c8cc5aa9c 100644 --- a/resources/views/custom_fields/fieldsets/edit.blade.php +++ b/resources/views/custom_fields/fieldsets/edit.blade.php @@ -29,7 +29,7 @@
- + {!! $errors->first('name', '') !!}
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php index f201d90dea..21ba1b4a01 100644 --- a/resources/views/custom_fields/fieldsets/view.blade.php +++ b/resources/views/custom_fields/fieldsets/view.blade.php @@ -86,7 +86,7 @@
diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php index 78849e8aed..2ece7f61c5 100755 --- a/resources/views/groups/edit.blade.php +++ b/resources/views/groups/edit.blade.php @@ -60,7 +60,7 @@
- + {!! $errors->first('name', '') !!}
diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php index dd80eef4ac..6823fcd8d6 100644 --- a/resources/views/hardware/audit.blade.php +++ b/resources/views/hardware/audit.blade.php @@ -73,7 +73,7 @@ {{ Form::label('name', trans('general.next_audit_date'), array('class' => 'col-md-3 control-label')) }}
- +
{!! $errors->first('next_audit_date', '') !!} @@ -85,7 +85,7 @@
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php index e18823f3be..9cf1d9d11a 100644 --- a/resources/views/hardware/bulk-checkout.blade.php +++ b/resources/views/hardware/bulk-checkout.blade.php @@ -39,7 +39,7 @@ {{ Form::label('checkout_at', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
- +
{!! $errors->first('checkout_at', '') !!} @@ -51,7 +51,7 @@ {{ Form::label('expected_checkin', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }}
- +
{!! $errors->first('expected_checkin', '') !!} @@ -63,7 +63,7 @@
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php index 30804be0ba..857720dc64 100755 --- a/resources/views/hardware/bulk.blade.php +++ b/resources/views/hardware/bulk.blade.php @@ -32,7 +32,7 @@
- + {!! $errors->first('purchase_date', '') !!}
@@ -44,7 +44,7 @@ {{ trans('admin/hardware/form.status') }}
- {{ Form::select('status_id', $statuslabel_list , Input::old('status_id'), array('class'=>'select2', 'style'=>'width:350px', 'aria-label'=>'status_id')) }} + {{ Form::select('status_id', $statuslabel_list , old('status_id'), array('class'=>'select2', 'style'=>'width:350px', 'aria-label'=>'status_id')) }} {!! $errors->first('status_id', '') !!}
@@ -60,12 +60,12 @@

@@ -81,7 +81,7 @@
{{ $snipeSettings->default_currency }} - + {!! $errors->first('purchase_cost', '') !!}
@@ -97,7 +97,7 @@ {{ trans('admin/hardware/form.order') }}
- + {!! $errors->first('order_number', '') !!}
@@ -109,7 +109,7 @@
- + {{ trans('admin/hardware/form.months') }} {!! $errors->first('warranty_months', '') !!}
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php index 488967b5b5..1223996b84 100755 --- a/resources/views/hardware/checkin.blade.php +++ b/resources/views/hardware/checkin.blade.php @@ -92,7 +92,7 @@
- +
{!! $errors->first('checkin_at', '') !!} @@ -108,7 +108,7 @@
+ name="note">{{ old('note', $asset->note) }} {!! $errors->first('note', '') !!}
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index ddd3e57b40..c65c7a1099 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -47,7 +47,7 @@
{{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
- + {!! $errors->first('name', '') !!}
@@ -90,7 +90,7 @@ {{ Form::label('checkout_at', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
- +
{!! $errors->first('checkout_at', '') !!} @@ -102,7 +102,7 @@ {{ Form::label('expected_checkin', trans('admin/hardware/form.expected_checkin'), array('class' => 'col-md-3 control-label')) }}
- +
{!! $errors->first('expected_checkin', '') !!} @@ -113,7 +113,7 @@
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php index 4a32c57022..1227c2dd79 100644 --- a/resources/views/hardware/quickscan.blade.php +++ b/resources/views/hardware/quickscan.blade.php @@ -61,7 +61,7 @@ {{ Form::label('next_audit_date', trans('general.next_audit_date'), array('class' => 'col-md-3 control-label')) }}
- +
{!! $errors->first('next_audit_date', '') !!} @@ -73,7 +73,7 @@
{{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/licenses/checkin.blade.php b/resources/views/licenses/checkin.blade.php index fb6a395073..d0fac872c5 100755 --- a/resources/views/licenses/checkin.blade.php +++ b/resources/views/licenses/checkin.blade.php @@ -52,7 +52,7 @@
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php index b801465286..85f8ebaddc 100755 --- a/resources/views/licenses/checkout.blade.php +++ b/resources/views/licenses/checkout.blade.php @@ -58,7 +58,7 @@
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php index 3aeef9a447..36dd4e457d 100755 --- a/resources/views/licenses/edit.blade.php +++ b/resources/views/licenses/edit.blade.php @@ -16,7 +16,7 @@
- + {!! $errors->first('serial', '') !!}
@@ -40,7 +40,7 @@
- + {!! $errors->first('license_name', '') !!}
@@ -49,7 +49,7 @@
- + {!! $errors->first('license_email', '') !!}
@@ -58,7 +58,7 @@
- {{ Form::Checkbox('reassignable', '1', Input::old('reassignable', $item->id ? $item->reassignable : '1'),array('class' => 'minimal', 'aria-label'=>'reassignable')) }} + {{ Form::Checkbox('reassignable', '1', old('reassignable', $item->id ? $item->reassignable : '1'),array('class' => 'minimal', 'aria-label'=>'reassignable')) }} {{ trans('general.yes') }}
@@ -75,7 +75,7 @@
- +
{!! $errors->first('expiration_date', '') !!} @@ -89,7 +89,7 @@
- +
{!! $errors->first('termination_date', '') !!} @@ -101,7 +101,7 @@
- + {!! $errors->first('purchase_order', '') !!}
@@ -112,7 +112,7 @@
- {{ Form::Checkbox('maintained', '1', Input::old('maintained', $item->maintained),array('class' => 'minimal', 'aria-label'=>'maintained')) }} + {{ Form::Checkbox('maintained', '1', old('maintained', $item->maintained),array('class' => 'minimal', 'aria-label'=>'maintained')) }} {{ trans('general.yes') }}
diff --git a/resources/views/locations/edit.blade.php b/resources/views/locations/edit.blade.php index e0e56ad171..53787c93bc 100755 --- a/resources/views/locations/edit.blade.php +++ b/resources/views/locations/edit.blade.php @@ -23,7 +23,7 @@ {{ trans('admin/locations/table.currency') }}
- {{ Form::text('currency', Input::old('currency', $item->currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;', 'aria-label'=>'currency')) }} + {{ Form::text('currency', old('currency', $item->currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;', 'aria-label'=>'currency')) }} {!! $errors->first('currency', '') !!}
@@ -37,7 +37,7 @@ {{ trans('admin/locations/table.ldap_ou') }}
- {{ Form::text('ldap_ou', Input::old('ldap_ou', $item->ldap_ou), array('class' => 'form-control')) }} + {{ Form::text('ldap_ou', old('ldap_ou', $item->ldap_ou), array('class' => 'form-control')) }} {!! $errors->first('ldap_ou', '') !!}
@@ -49,7 +49,7 @@

Image for {{ $item->name }} diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php index c62345c8ba..154b9fbed0 100755 --- a/resources/views/manufacturers/edit.blade.php +++ b/resources/views/manufacturers/edit.blade.php @@ -15,7 +15,7 @@
- + {!! $errors->first('url', '') !!}
@@ -25,7 +25,7 @@
- + {!! $errors->first('support_url', '') !!}
@@ -35,7 +35,7 @@
- + {!! $errors->first('support_phone', '') !!}
@@ -45,7 +45,7 @@
- + {!! $errors->first('support_email', '') !!}
@@ -56,7 +56,7 @@

Image for {{ $item->name }} diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php index efb3d018b8..8d85646525 100644 --- a/resources/views/modals/upload-file.blade.php +++ b/resources/views/modals/upload-file.blade.php @@ -31,7 +31,7 @@
- {{ Form::textarea('notes', Input::old('notes', Input::old('notes')), ['class' => 'form-control','placeholder' => 'Notes (Optional)', 'rows'=>3, 'aria-label' => 'file']) }} + {{ Form::textarea('notes', old('notes', old('notes')), ['class' => 'form-control','placeholder' => 'Notes (Optional)', 'rows'=>3, 'aria-label' => 'file']) }}
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php index a636a6accf..c4cfb800e1 100644 --- a/resources/views/models/bulk-edit.blade.php +++ b/resources/views/models/bulk-edit.blade.php @@ -39,7 +39,7 @@ {{ trans('admin/models/general.fieldset') }}
- {{ Form::select('fieldset_id', $fieldset_list , Input::old('fieldset_id', 'NC'), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px')) }} + {{ Form::select('fieldset_id', $fieldset_list , old('fieldset_id', 'NC'), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px')) }} {!! $errors->first('fieldset_id', '') !!}
@@ -51,7 +51,7 @@ {{ trans('general.depreciation') }}
- {{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', 'NC'), array('class'=>'select2', 'style'=>'width:350px')) }} + {{ Form::select('depreciation_id', $depreciation_list , old('depreciation_id', 'NC'), array('class'=>'select2', 'style'=>'width:350px')) }} {!! $errors->first('depreciation_id', '') !!}
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php index b365389190..638cf62ced 100644 --- a/resources/views/models/custom_fields_form.blade.php +++ b/resources/views/models/custom_fields_form.blade.php @@ -36,7 +36,7 @@
- +
diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php index c62e0c49f1..810282ef9d 100755 --- a/resources/views/models/edit.blade.php +++ b/resources/views/models/edit.blade.php @@ -38,7 +38,7 @@
- {{ Form::select('custom_fieldset', \App\Helpers\Helper::customFieldsetList(),Input::old('custom_fieldset', $item->fieldset_id), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px', 'aria-label'=>'custom_fieldset')) }} + {{ Form::select('custom_fieldset', \App\Helpers\Helper::customFieldsetList(),old('custom_fieldset', $item->fieldset_id), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px', 'aria-label'=>'custom_fieldset')) }} {!! $errors->first('custom_fieldset', '') !!}
diff --git a/resources/views/settings/barcodes.blade.php b/resources/views/settings/barcodes.blade.php index 4a916e479c..9bd6be17d0 100644 --- a/resources/views/settings/barcodes.blade.php +++ b/resources/views/settings/barcodes.blade.php @@ -47,7 +47,7 @@ {{ Form::label('qr_code', trans('admin/settings/general.display_qr')) }}
- {{ Form::checkbox('qr_code', '1', Input::old('qr_code', $setting->qr_code),array('class' => 'minimal', 'aria-label'=>'qr_code')) }} + {{ Form::checkbox('qr_code', '1', old('qr_code', $setting->qr_code),array('class' => 'minimal', 'aria-label'=>'qr_code')) }} {{ trans('general.yes') }}
@@ -58,7 +58,7 @@ {{ Form::label('barcode_type', trans('admin/settings/general.barcode_type')) }}
- {!! Form::barcode_types('barcode_type', Input::old('barcode_type', $setting->barcode_type), 'select2') !!} + {!! Form::barcode_types('barcode_type', old('barcode_type', $setting->barcode_type), 'select2') !!} {!! $errors->first('barcode_type', '') !!}
@@ -69,7 +69,7 @@ {{ Form::label('alt_barcode_enabled', trans('admin/settings/general.display_alt_barcode')) }}
- {{ Form::checkbox('alt_barcode_enabled', '1', Input::old('alt_barcode_enabled', $setting->alt_barcode_enabled),array('class' => 'minimal', 'aria-label'=>'alt_barcode_enabled')) }} + {{ Form::checkbox('alt_barcode_enabled', '1', old('alt_barcode_enabled', $setting->alt_barcode_enabled),array('class' => 'minimal', 'aria-label'=>'alt_barcode_enabled')) }} {{ trans('general.yes') }}
@@ -80,7 +80,7 @@ {{ Form::label('alt_barcode', trans('admin/settings/general.alt_barcode_type')) }}
- {!! Form::alt_barcode_types('alt_barcode', Input::old('alt_barcode', $setting->alt_barcode), 'select2') !!} + {!! Form::alt_barcode_types('alt_barcode', old('alt_barcode', $setting->alt_barcode), 'select2') !!} {!! $errors->first('barcode_type', '') !!}
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php index 63085a9cb1..ac510260f5 100644 --- a/resources/views/settings/branding.blade.php +++ b/resources/views/settings/branding.blade.php @@ -76,7 +76,7 @@ {!! $errors->first('image', '') !!} @endif @@ -90,7 +90,7 @@ {{ Form::label('brand', trans('admin/settings/general.brand')) }}
- {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), Input::old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} + {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} {!! $errors->first('brand', '') !!}
@@ -139,7 +139,7 @@ {{ Form::label('logo_print_assets', trans('admin/settings/general.logo_print_assets')) }}
- {{ Form::checkbox('logo_print_assets', '1', Input::old('logo_print_assets', $setting->logo_print_assets),array('class' => 'minimal', 'aria-label'=>'logo_print_assets')) }} + {{ Form::checkbox('logo_print_assets', '1', old('logo_print_assets', $setting->logo_print_assets),array('class' => 'minimal', 'aria-label'=>'logo_print_assets')) }} {{ trans('admin/settings/general.logo_print_assets_help') }}
@@ -152,7 +152,7 @@ {{ Form::label('show_url_in_emails', trans('admin/settings/general.show_url_in_emails')) }}
- {{ Form::checkbox('show_url_in_emails', '1', Input::old('show_url_in_emails', $setting->show_url_in_emails),array('class' => 'minimal', 'aria-label'=>'show_url_in_emails')) }} + {{ Form::checkbox('show_url_in_emails', '1', old('show_url_in_emails', $setting->show_url_in_emails),array('class' => 'minimal', 'aria-label'=>'show_url_in_emails')) }} {{ trans('general.yes') }}

{{ trans('admin/settings/general.show_url_in_emails_help_text') }}

@@ -165,7 +165,7 @@
- {{ Form::text('header_color', Input::old('header_color', $setting->header_color), array('class' => 'form-control', 'style' => 'width: 100px;','placeholder' => '#FF0000', 'aria-label'=>'header_color')) }} + {{ Form::text('header_color', old('header_color', $setting->header_color), array('class' => 'form-control', 'style' => 'width: 100px;','placeholder' => '#FF0000', 'aria-label'=>'header_color')) }}
@@ -180,7 +180,7 @@ {{ Form::label('skin', trans('general.skin')) }}
- {!! Form::skin('skin', Input::old('skin', $setting->skin), 'select2') !!} + {!! Form::skin('skin', old('skin', $setting->skin), 'select2') !!} {!! $errors->first('skin', '') !!}
@@ -193,11 +193,11 @@
@if (config('app.lock_passwords')===true) - {{ Form::textarea('custom_css', Input::old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS','disabled'=>'disabled', 'aria-label'=>'custom_css')) }} + {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS','disabled'=>'disabled', 'aria-label'=>'custom_css')) }} {!! $errors->first('custom_css', '') !!}

{{ trans('general.lock_passwords') }}

@else - {{ Form::textarea('custom_css', Input::old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS', 'aria-label'=>'custom_css')) }} + {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS', 'aria-label'=>'custom_css')) }} {!! $errors->first('custom_css', '') !!} @endif

{!! trans('admin/settings/general.custom_css_help') !!}

diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index ba2a0b193b..17d09bc191 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -48,7 +48,7 @@ {{ Form::label('full_multiple_companies_support', trans('admin/settings/general.full_multiple_companies_support_text')) }}
- {{ Form::checkbox('full_multiple_companies_support', '1', Input::old('full_multiple_companies_support', $setting->full_multiple_companies_support),array('class' => 'minimal', 'aria-label'=>'full_multiple_companies_support')) }} + {{ Form::checkbox('full_multiple_companies_support', '1', old('full_multiple_companies_support', $setting->full_multiple_companies_support),array('class' => 'minimal', 'aria-label'=>'full_multiple_companies_support')) }} {{ trans('admin/settings/general.full_multiple_companies_support_text') }} {!! $errors->first('full_multiple_companies_support', '') !!}

@@ -94,7 +94,7 @@ {{ Form::label('email_format', trans('general.email_format')) }}

- {!! Form::username_format('email_format', Input::old('email_format', $setting->email_format), 'select2') !!} + {!! Form::username_format('email_format', old('email_format', $setting->email_format), 'select2') !!} {!! $errors->first('email_format', '') !!}
@@ -105,7 +105,7 @@ {{ Form::label('username_format', trans('general.username_format')) }}
- {!! Form::username_format('username_format', Input::old('username_format', $setting->username_format), 'select2') !!} + {!! Form::username_format('username_format', old('username_format', $setting->username_format), 'select2') !!} {!! $errors->first('username_format', '') !!}

@@ -149,7 +149,7 @@ {{ Form::label('per_page', trans('admin/settings/general.per_page')) }}

- {{ Form::text('per_page', Input::old('per_page', $setting->per_page), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} + {{ Form::text('per_page', old('per_page', $setting->per_page), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} {!! $errors->first('per_page', '') !!}
@@ -172,7 +172,7 @@ {{ Form::label('default_eula_text', trans('admin/settings/general.default_eula_text')) }}
- {{ Form::textarea('default_eula_text', Input::old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }} + {{ Form::textarea('default_eula_text', old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }} {!! $errors->first('default_eula_text', '') !!}

{{ trans('admin/settings/general.default_eula_help_text') }}

{!! trans('admin/settings/general.eula_markdown') !!}

@@ -188,11 +188,11 @@
@if (config('app.lock_passwords')) - + {!! $errors->first('login_note', '') !!}

{{ trans('general.lock_passwords') }}

@else - + {!! $errors->first('login_note', '') !!} @endif

{!! trans('admin/settings/general.login_note_help') !!}

@@ -228,11 +228,11 @@
@if (config('app.lock_passwords')) - + {!! $errors->first('dashboard_message', '') !!}

{{ trans('general.lock_passwords') }}

@else - + {!! $errors->first('dashboard_message', '') !!} @endif

@@ -279,10 +279,10 @@ trans('admin/settings/general.show_in_model_list')) }}

- {{ Form::checkbox('show_in_model_list[]', 'image', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('image')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.image') }}
- {{ Form::checkbox('show_in_model_list[]', 'category', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('category')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.category') }}
- {{ Form::checkbox('show_in_model_list[]', 'manufacturer', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('manufacturer')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.manufacturer') }}
- {{ Form::checkbox('show_in_model_list[]', 'model_number', Input::old('show_in_model_list', $snipeSettings->modellistCheckedValue('model_number')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.model_no') }}
+ {{ Form::checkbox('show_in_model_list[]', 'image', old('show_in_model_list', $snipeSettings->modellistCheckedValue('image')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.image') }}
+ {{ Form::checkbox('show_in_model_list[]', 'category', old('show_in_model_list', $snipeSettings->modellistCheckedValue('category')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.category') }}
+ {{ Form::checkbox('show_in_model_list[]', 'manufacturer', old('show_in_model_list', $snipeSettings->modellistCheckedValue('manufacturer')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.manufacturer') }}
+ {{ Form::checkbox('show_in_model_list[]', 'model_number', old('show_in_model_list', $snipeSettings->modellistCheckedValue('model_number')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.model_no') }}
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index a29ffe21e1..21396ec510 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -45,7 +45,7 @@ {{ Form::label('labels_per_page', trans('admin/settings/general.labels_per_page')) }}
- {{ Form::text('labels_per_page', Input::old('labels_per_page', $setting->labels_per_page), ['class' => 'form-control','style' => 'width: 100px;', 'aria-label'=>'labels_per_page']) }} + {{ Form::text('labels_per_page', old('labels_per_page', $setting->labels_per_page), ['class' => 'form-control','style' => 'width: 100px;', 'aria-label'=>'labels_per_page']) }} {!! $errors->first('labels_per_page', '') !!}
@@ -56,7 +56,7 @@
- {{ Form::text('labels_fontsize', Input::old('labels_fontsize', $setting->labels_fontsize), ['class' => 'form-control', 'aria-label'=>'labels_fontsize']) }} + {{ Form::text('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize), ['class' => 'form-control', 'aria-label'=>'labels_fontsize']) }}
{{ trans('admin/settings/general.text_pt') }}
@@ -71,13 +71,13 @@
- {{ Form::text('labels_width', Input::old('labels_width', $setting->labels_width), ['class' => 'form-control', 'aria-label'=>'labels_width']) }} + {{ Form::text('labels_width', old('labels_width', $setting->labels_width), ['class' => 'form-control', 'aria-label'=>'labels_width']) }}
{{ trans('admin/settings/general.width_w') }}
- {{ Form::text('labels_height', Input::old('labels_height', $setting->labels_height), ['class' => 'form-control', 'aria-label'=>'labels_height']) }} + {{ Form::text('labels_height', old('labels_height', $setting->labels_height), ['class' => 'form-control', 'aria-label'=>'labels_height']) }}
{{ trans('admin/settings/general.height_h') }}
@@ -93,13 +93,13 @@
- {{ Form::text('labels_display_sgutter', Input::old('labels_display_sgutter', $setting->labels_display_sgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_sgutter']) }} + {{ Form::text('labels_display_sgutter', old('labels_display_sgutter', $setting->labels_display_sgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_sgutter']) }}
{{ trans('admin/settings/general.horizontal') }}
- {{ Form::text('labels_display_bgutter', Input::old('labels_display_bgutter', $setting->labels_display_bgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_bgutter']) }} + {{ Form::text('labels_display_bgutter', old('labels_display_bgutter', $setting->labels_display_bgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_bgutter']) }}
{{ trans('admin/settings/general.vertical') }}
@@ -115,21 +115,21 @@
- {{ Form::text('labels_pmargin_top', Input::old('labels_pmargin_top', $setting->labels_pmargin_top), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_top']) }} + {{ Form::text('labels_pmargin_top', old('labels_pmargin_top', $setting->labels_pmargin_top), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_top']) }}
{{ trans('admin/settings/general.top') }}
- {{ Form::text('labels_pmargin_right', Input::old('labels_pmargin_right', $setting->labels_pmargin_right), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_right']) }} + {{ Form::text('labels_pmargin_right', old('labels_pmargin_right', $setting->labels_pmargin_right), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_right']) }}
{{ trans('admin/settings/general.right') }}
- {{ Form::text('labels_pmargin_bottom', Input::old('labels_pmargin_bottom', $setting->labels_pmargin_bottom), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_bottom']) }} + {{ Form::text('labels_pmargin_bottom', old('labels_pmargin_bottom', $setting->labels_pmargin_bottom), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_bottom']) }}
{{ trans('admin/settings/general.bottom') }}
- {{ Form::text('labels_pmargin_left', Input::old('labels_pmargin_left', $setting->labels_pmargin_left), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_left']) }} + {{ Form::text('labels_pmargin_left', old('labels_pmargin_left', $setting->labels_pmargin_left), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_left']) }}
{{ trans('admin/settings/general.left') }}
@@ -146,13 +146,13 @@
- {{ Form::text('labels_pagewidth', Input::old('labels_pagewidth', $setting->labels_pagewidth), ['class' => 'form-control', 'aria-label'=>'labels_pagewidth']) }} + {{ Form::text('labels_pagewidth', old('labels_pagewidth', $setting->labels_pagewidth), ['class' => 'form-control', 'aria-label'=>'labels_pagewidth']) }}
{{ trans('admin/settings/general.width_w') }}
- {{ Form::text('labels_pageheight', Input::old('labels_pageheight', $setting->labels_pageheight), ['class' => 'form-control', 'aria-label'=>'labels_pageheight']) }} + {{ Form::text('labels_pageheight', old('labels_pageheight', $setting->labels_pageheight), ['class' => 'form-control', 'aria-label'=>'labels_pageheight']) }}
{{ trans('admin/settings/general.height_h') }}
@@ -169,23 +169,23 @@
diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php index 2688fba94c..76063944cf 100644 --- a/resources/views/settings/localization.blade.php +++ b/resources/views/settings/localization.blade.php @@ -72,7 +72,7 @@ {{ Form::label('default_currency', trans('admin/settings/general.default_currency')) }}
- {{ Form::text('default_currency', Input::old('default_currency', $setting->default_currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} + {{ Form::text('default_currency', old('default_currency', $setting->default_currency), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} {!! $errors->first('default_currency', '') !!}
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php index 95869f5a1a..dfac9eea07 100644 --- a/resources/views/settings/security.blade.php +++ b/resources/views/settings/security.blade.php @@ -81,7 +81,7 @@
{!! $errors->first('pwd_secure_uncommon', '') !!} @@ -99,16 +99,16 @@
- {{ Form::checkbox("pwd_secure_complexity['letters']", 'letters', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} + {{ Form::checkbox("pwd_secure_complexity['letters']", 'letters', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} Require at least one letter
- {{ Form::checkbox("pwd_secure_complexity['numbers']", 'numbers', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} + {{ Form::checkbox("pwd_secure_complexity['numbers']", 'numbers', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} Require at least one number
- {{ Form::checkbox("pwd_secure_complexity['symbols']", 'symbols', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} + {{ Form::checkbox("pwd_secure_complexity['symbols']", 'symbols', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} Require at least one symbol
- {{ Form::checkbox("pwd_secure_complexity['case_diff']", 'case_diff', Input::old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} + {{ Form::checkbox("pwd_secure_complexity['case_diff']", 'case_diff', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }} Require at least one uppercase and one lowercase

@@ -129,7 +129,7 @@ @if (config('app.lock_passwords'))

{{ trans('general.feature_disabled') }}

@else - {{ Form::checkbox('login_remote_user_enabled', '1', Input::old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('class' => 'minimal', 'aria-label'=>'login_remote_user')) }} + {{ Form::checkbox('login_remote_user_enabled', '1', old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('class' => 'minimal', 'aria-label'=>'login_remote_user')) }} {{ Form::label('login_remote_user_enabled', trans('admin/settings/general.login_remote_user_enabled_text')) }} {!! $errors->first('login_remote_user_enabled', '') !!}

@@ -144,7 +144,7 @@

{{ Form::label('login_remote_user_custom_logout_url', trans('admin/settings/general.login_remote_user_custom_logout_url_text')) }} - {{ Form::text('login_remote_user_custom_logout_url', Input::old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url),array('class' => 'form-control', 'aria-label'=>'login_remote_user_custom_logout_url')) }} + {{ Form::text('login_remote_user_custom_logout_url', old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url),array('class' => 'form-control', 'aria-label'=>'login_remote_user_custom_logout_url')) }} {!! $errors->first('login_remote_user_custom_logout_url', '') !!}

@@ -153,7 +153,7 @@ {!! $errors->first('login_common_disabled', '') !!} diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php index 3543bde836..f3222002e2 100644 --- a/resources/views/setup/user.blade.php +++ b/resources/views/setup/user.blade.php @@ -101,7 +101,7 @@ Create a User ::

{{ Form::label('email_format', trans('general.email_format')) }} - {!! Form::username_format('email_format', Input::old('email_format', 'filastname'), 'select2') !!} + {!! Form::username_format('email_format', old('email_format', 'filastname'), 'select2') !!} {!! $errors->first('email_format', '') !!}
@@ -111,14 +111,14 @@ Create a User ::
{{ Form::label('first_name', trans('general.first_name')) }} - {{ Form::text('first_name', Input::old('first_name'), array('class' => 'form-control','placeholder' => 'Jane')) }} + {{ Form::text('first_name', old('first_name'), array('class' => 'form-control','placeholder' => 'Jane')) }} {!! $errors->first('first_name', '') !!}
{{ Form::label('last_name', trans('general.last_name')) }} - {{ Form::text('last_name', Input::old('last_name'), array('class' => 'form-control','placeholder' => 'Smith')) }} + {{ Form::text('last_name', old('last_name'), array('class' => 'form-control','placeholder' => 'Smith')) }} {!! $errors->first('last_name', '') !!}
@@ -134,7 +134,7 @@ Create a User ::
{{ Form::label('username', trans('admin/users/table.username')) }} - {{ Form::text('username', Input::old('username'), array('class' => 'form-control','placeholder' => 'jsmith')) }} + {{ Form::text('username', old('username'), array('class' => 'form-control','placeholder' => 'jsmith')) }} {!! $errors->first('username', '') !!}
diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php index 59e0d852fc..ac85915aa8 100755 --- a/resources/views/suppliers/edit.blade.php +++ b/resources/views/suppliers/edit.blade.php @@ -16,7 +16,7 @@
{{ Form::label('contact', trans('admin/suppliers/table.contact'), array('class' => 'col-md-3 control-label')) }}
- {{Form::text('contact', Input::old('contact', $item->contact), array('class' => 'form-control')) }} + {{Form::text('contact', old('contact', $item->contact), array('class' => 'form-control')) }} {!! $errors->first('contact', '') !!}
@@ -26,7 +26,7 @@
{{ Form::label('fax', trans('admin/suppliers/table.fax'), array('class' => 'col-md-3 control-label')) }}
- {{Form::text('fax', Input::old('fax', $item->fax), array('class' => 'form-control')) }} + {{Form::text('fax', old('fax', $item->fax), array('class' => 'form-control')) }} {!! $errors->first('fax', '') !!}
@@ -36,7 +36,7 @@
{{ Form::label('url', trans('admin/suppliers/table.url'), array('class' => 'col-md-3 control-label')) }}
- {{Form::text('url', Input::old('url', $item->url), array('class' => 'form-control')) }} + {{Form::text('url', old('url', $item->url), array('class' => 'form-control')) }} {!! $errors->first('url', '') !!}
diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php index e85767d413..b62a73b2a2 100644 --- a/resources/views/users/bulk-edit.blade.php +++ b/resources/views/users/bulk-edit.blade.php @@ -50,7 +50,7 @@
- {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} + {!! Form::locales('locale', old('locale', $user->locale), 'select2') !!} {!! $errors->first('locale', '') !!}
@@ -64,8 +64,8 @@
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 93500ef48e..85766b4d69 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -88,7 +88,7 @@
- + {!! $errors->first('first_name', '') !!}
@@ -97,7 +97,7 @@
- + {!! $errors->first('last_name', '') !!}
@@ -234,7 +234,7 @@
- {!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!} + {!! Form::locales('locale', old('locale', $user->locale), 'select2') !!} {!! $errors->first('locale', '') !!}
@@ -286,7 +286,7 @@
- + {!! $errors->first('phone', '') !!}
@@ -295,7 +295,7 @@
- + {!! $errors->first('website', '') !!}
@@ -304,7 +304,7 @@
- + {!! $errors->first('address', '') !!}
@@ -313,7 +313,7 @@
- + {!! $errors->first('city', '') !!}
@@ -322,7 +322,7 @@
- + {!! $errors->first('state', '') !!}
@@ -331,7 +331,7 @@
- {!! Form::countries('country', Input::old('country', $user->country), 'select2') !!} + {!! Form::countries('country', old('country', $user->country), 'select2') !!} {!! $errors->first('country', '') !!}
@@ -340,7 +340,7 @@
- + {!! $errors->first('zip', '') !!}
@@ -448,7 +448,7 @@
- + {!! $errors->first('notes', '') !!}
diff --git a/webpack.mix.js b/webpack.mix.js index 0e6f549891..806c889e31 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -34,7 +34,6 @@ mix './public/js/build' ).sourceMaps() .scripts([ - './node_modules/jquery/jquery.js', './node_modules/jquery-ui/jquery-ui.js', './public/js/build/vue.js', //this is the modularized nifty Vue.js thing we just built, above! './node_modules/tether/dist/js/tether.min.js',