DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added jquery-form-validator

Browse source
This commit is contained in:
snipe 2018-10-04 23:50:57 -07:00
parent 4cc1351bdd
commit a6449fa16e
5 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -35,6 +35,7 @@
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"icheck": "^1.0.2", "icheck": "^1.0.2",
"imagemin": "^5.3.1", "imagemin": "^5.3.1",
"jquery-form-validator": "^2.3.79",
"jquery-slimscroll": "^1.3.8", "jquery-slimscroll": "^1.3.8",
"jquery-ui": "^1.12.1", "jquery-ui": "^1.12.1",
"jquery-ui-dist": "^1.12.1", "jquery-ui-dist": "^1.12.1",

BIN
public/js/vendor.js
View file

Binary file not shown.

2
public/mix-manifest.json
View file

@ -8,7 +8,7 @@
"/css/skins/skin-red-dark.min.css": "/css/skins/skin-red-dark.min.css?id=99f90bbd653d7db10795", "/css/skins/skin-red-dark.min.css": "/css/skins/skin-red-dark.min.css?id=99f90bbd653d7db10795",
"/css/signature-pad.css": "/css/signature-pad.css?id=6a89d3cd901305e66ced", "/css/signature-pad.css": "/css/signature-pad.css?id=6a89d3cd901305e66ced",
"/css/signature-pad.min.css": "/css/signature-pad.min.css?id=6a89d3cd901305e66ced", "/css/signature-pad.min.css": "/css/signature-pad.min.css?id=6a89d3cd901305e66ced",
"/js/vendor.js": "/js/vendor.js?id=c8bc37fd1a8b2d7aea69", "/js/vendor.js": "/js/vendor.js?id=39523e966a9bc7a70731",
"/js/html5shiv.min.js": "/js/html5shiv.min.js?id=ba846cb704dbfbc5f1b3", "/js/html5shiv.min.js": "/js/html5shiv.min.js?id=ba846cb704dbfbc5f1b3",
"/js/respond.min.js": "/js/respond.min.js?id=afc1984a3d17110449dc", "/js/respond.min.js": "/js/respond.min.js?id=afc1984a3d17110449dc",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=7223478ba9bf2c6dfb4f", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=7223478ba9bf2c6dfb4f",

13
resources/views/hardware/edit.blade.php
View file

@ -21,12 +21,12 @@
<!-- we are editing an existing asset --> <!-- we are editing an existing asset -->
@if ($item->id) @if ($item->id)
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}">
<input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', $item->asset_tag) }}" /> <input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', $item->asset_tag) }}" data-validation="required">
</div> </div>
@else @else
<!-- we are creating a new asset - let people use more than one asset tag --> <!-- we are creating a new asset - let people use more than one asset tag -->
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}">
<input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', \App\Models\Asset::autoincrement_asset()) }}"> <input class="form-control" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag', \App\Models\Asset::autoincrement_asset()) }}" data-validation="required">
</div> </div>
<div class="col-md-2 col-sm-12"> <div class="col-md-2 col-sm-12">
<button class="add_field_button btn btn-default btn-sm"><i class="fa fa-plus"></i></button> <button class="add_field_button btn btn-default btn-sm"><i class="fa fa-plus"></i></button>
@ -111,8 +111,15 @@
@stop @stop
@section('moar_scripts') @section('moar_scripts')
<script nonce="{{ csrf_token() }}"> <script nonce="{{ csrf_token() }}">
$.validate({
form : '#create-form'
});
var transformed_oldvals={}; var transformed_oldvals={};
function fetchCustomFields() { function fetchCustomFields() {
@ -226,7 +233,7 @@
box_html += '<span class="fields_wrapper">'; box_html += '<span class="fields_wrapper">';
box_html += '<div class="form-group"><label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }} ' + x + '</label>'; box_html += '<div class="form-group"><label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }} ' + x + '</label>';
box_html += '<div class="col-md-7 col-sm-12 required">'; box_html += '<div class="col-md-7 col-sm-12 required">';
box_html += '<input type="text" class="form-control" name="asset_tags[' + x + ']" value="{{ ($snipeSettings->auto_increment_prefix!='' && $snipeSettings->auto_increment_assets=='1') ? $snipeSettings->auto_increment_prefix : '' }}'+ incremented_tag +'">'; box_html += '<input type="text" class="form-control" name="asset_tags[' + x + ']" value="{{ ($snipeSettings->auto_increment_prefix!='' && $snipeSettings->auto_increment_assets=='1') ? $snipeSettings->auto_increment_prefix : '' }}'+ incremented_tag +'" data-validation="required">';
box_html += '</div>'; box_html += '</div>';
box_html += '<div class="col-md-2 col-sm-12">'; box_html += '<div class="col-md-2 col-sm-12">';
box_html += '<a href="#" class="remove_field btn btn-default btn-sm"><i class="fa fa-minus"></i></a>'; box_html += '<a href="#" class="remove_field btn btn-default btn-sm"><i class="fa fa-minus"></i></a>';

3
webpack.mix.js
View file

@ -75,7 +75,8 @@ mix
"./node_modules/icheck/icheck.js", "./node_modules/icheck/icheck.js",
"./resources/assets/js/extensions/pGenerator.jquery.js", "./resources/assets/js/extensions/pGenerator.jquery.js",
"./node_modules/chart.js/dist/Chart.js", "./node_modules/chart.js/dist/Chart.js",
"./resources/assets/js/signature_pad.js" "./resources/assets/js/signature_pad.js",
"./node_modules/jquery-form-validator/form-validator/jquery.form-validator.js"
], ],
"public/js/vendor.js" "public/js/vendor.js"
) )