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

Major overhaul for modals, and a fix for #4820 (#4866)

Browse source 
Changes how the various modals work, and allows for specifying
category_type when inline-creating categories.
This commit is contained in:
Brady Wetherington 2018-01-20 03:42:29 -05:00 committed by snipe
parent 7fae380ab6
commit dfb2b9b569
25 changed files with 144 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/css/app.css
View file

Binary file not shown.

BIN
public/js/build/all.js
View file

Binary file not shown.

BIN
public/js/build/vue.js
View file

Binary file not shown.

BIN
public/js/build/vue.js.map
View file

Binary file not shown.

BIN
public/js/dist/all.js vendored
View file

Binary file not shown.

10
public/mix-manifest.json
View file

@ -1,14 +1,14 @@
{ {
"/js/build/vue.js": "/js/build/vue.js?id=25049a0c0eb736e1c883", "/js/build/vue.js": "/js/build/vue.js?id=7de68d09c5faff74d7b7",
"/css/AdminLTE.css": "/css/AdminLTE.css?id=b8be19a285eaf44eec37", "/css/AdminLTE.css": "/css/AdminLTE.css?id=b8be19a285eaf44eec37",
"/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405", "/css/app.css": "/css/app.css?id=c9a81f09fdea13a28c54",
"/css/overrides.css": "/css/overrides.css?id=1bdafb06a8609780f546", "/css/overrides.css": "/css/overrides.css?id=1bdafb06a8609780f546",
"/js/build/vue.js.map": "/js/build/vue.js.map?id=6b79d08f1decca72957c", "/js/build/vue.js.map": "/js/build/vue.js.map?id=acc97065a23ea72f47ad",
"/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=99f5a5a03c4155cf69f6", "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=99f5a5a03c4155cf69f6",
"/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72", "/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72",
"/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b", "/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b",
"/css/dist/all.css": "/css/dist/all.css?id=3a8aa974e7b09b52b18c", "/css/dist/all.css": "/css/dist/all.css?id=3a8aa974e7b09b52b18c",
"/js/dist/all.js": "/js/dist/all.js?id=3e9a0821dc9154d68a26", "/js/dist/all.js": "/js/dist/all.js?id=1528aeec676d855a2ecd",
"/css/build/all.css": "/css/build/all.css?id=3a8aa974e7b09b52b18c", "/css/build/all.css": "/css/build/all.css?id=3a8aa974e7b09b52b18c",
"/js/build/all.js": "/js/build/all.js?id=3e9a0821dc9154d68a26" "/js/build/all.js": "/js/build/all.js?id=1528aeec676d855a2ecd"
} }

26
resources/assets/js/snipeit_modals.js
View file

@ -11,15 +11,17 @@
Create a Button looking like this: Create a Button looking like this:
<a href='{{ route('modal.user') }}' data-toggle="modal" data-target="#createModal" data-dependency="user" data-select='assigned_to' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.user') }}' data-toggle="modal" data-target="#createModal" data-select='assigned_to' class="btn btn-sm btn-default">New</a>
If you don't have access to Blade commands (like {{ and }}, etc), you can hard-code a URL as the 'href' If you don't have access to Blade commands (like {{ and }}, etc), you can hard-code a URL as the 'href'
data-toggle="modal" - required for Bootstrap Modals data-toggle="modal" - required for Bootstrap Modals
data-target="#createModal" - fixed ID for the modal, do not change data-target="#createModal" - fixed ID for the modal, do not change
data-dependency="user" - which Snipe-IT model you're going to be creating.
data-select="assigned_to" - What is the *ID* of the select-dropdown that you're going to be adding to, if the modal-create was a success? Be on the lookout for duplicate ID's, it will confuse this library! data-select="assigned_to" - What is the *ID* of the select-dropdown that you're going to be adding to, if the modal-create was a success? Be on the lookout for duplicate ID's, it will confuse this library!
class="btn btn-sm btn-default" - makes it look button-ey, feel free to change :) class="btn btn-sm btn-default" - makes it look button-ey, feel free to change :)
If you want to pass additional variables to the modal (In the Category Create one, for example, you can pass category_id), you can encode them as URL variables in the href
*/ */
$(function () { $(function () {
@ -44,31 +46,15 @@
$('#createModal').on('click','#modal-save', function () { $('#createModal').on('click','#modal-save', function () {
var data = {};
//console.warn("We are about to SAVE!!! for model: "+model+" and select ID: "+select);
$('.modal-body input:visible').each(function (index, elem) {
var bits = elem.id.split("-");
if (bits[0] === "modal") {
data[bits[1]] = $(elem).val();
}
});
//this can probably get replaced with a normal 'serialize' instead
$('.modal-body select:visible').each(function (index, elem) {
var bits = elem.id.split("-");
data[bits[1]] = $(elem).val();
});
data._token = Laravel.csrfToken;
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
url: baseUrl+ "/api/v1/" + model + "s", url: $('.modal-body form').attr('action'),
headers: { headers: {
"X-Requested-With": 'XMLHttpRequest', "X-Requested-With": 'XMLHttpRequest',
"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content') "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
}, },
data: data, data: $('.modal-body form').serialize(),
success: function (result) { success: function (result) {
console.dir(result); console.dir(result);

2
resources/views/accessories/edit.blade.php
View file

@ -11,7 +11,7 @@
@include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id']) @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/accessories/general.accessory_name')]) @include ('partials.forms.edit.name', ['translated_name' => trans('admin/accessories/general.accessory_name')])
@include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id', 'required' => 'true']) @include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id', 'required' => 'true','category_type' => 'accessory'])
@include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id']) @include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true']) @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true'])
@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id']) @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])

2
resources/views/components/edit.blade.php
View file

@ -11,7 +11,7 @@
@section('inputFields') @section('inputFields')
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/components/table.title')]) @include ('partials.forms.edit.name', ['translated_name' => trans('admin/components/table.title')])
@include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id']) @include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id','category_type' => 'component'])
@include ('partials.forms.edit.quantity') @include ('partials.forms.edit.quantity')
@include ('partials.forms.edit.minimum_quantity') @include ('partials.forms.edit.minimum_quantity')
@include ('partials.forms.edit.serial') @include ('partials.forms.edit.serial')

2
resources/views/consumables/edit.blade.php
View file

@ -10,7 +10,7 @@
@include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id']) @include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/consumables/table.title')]) @include ('partials.forms.edit.name', ['translated_name' => trans('admin/consumables/table.title')])
@include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id', 'required' => 'true']) @include ('partials.forms.edit.category-select', ['translated_name' => trans('general.category'), 'fieldname' => 'category_id', 'required' => 'true', 'category_type' => 'consumable'])
@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true']) @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true'])
@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id']) @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'location_id'])
@include ('partials.forms.edit.model_number') @include ('partials.forms.edit.model_number')

34
resources/views/modals/category.blade.php
View file

@ -1,3 +1,4 @@
{{-- See snipeit_modals.js for what powers this --}}
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@ -6,30 +7,19 @@
<h4 class="modal-title">{{ trans('admin/categories/general.create') }}</h4> <h4 class="modal-title">{{ trans('admin/categories/general.create') }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="alert alert-danger" id="modal_error_msg" style="display:none"> <form action="{{ route('api.categories.store') }}" onsubmit="return false">
</div> {{ csrf_field() }}
<div class="dynamic-form-row"> <div class="alert alert-danger" id="modal_error_msg" style="display:none">
<div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
</label></div>
<div class="col-md-8 col-xs-12 required">
<input type='text' id='modal-name' class="form-control">
</div> </div>
</div> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
<div class="dynamic-form-row"> </label></div>
<div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}: <div class="col-md-8 col-xs-12 required">
</label></div> <input type='text' name='name' id='modal-name' class="form-control">
<div class="col-md-8 col-xs-12 required"> </div>
<select class="select2" id="modal-category_type" style="width: 100%">
<option value="asset">Asset</option>
<option value="accessory" disabled>Accessory</option>
<option value="consumable" disabled>Consumable</option>
<option value="component" disabled>Component</option>
</select>
</div> </div>
</div> <input type="hidden" name='category_type' id="modal-category_type" value="{{ request('category_type') }}" />
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>

33
resources/views/modals/location.blade.php
View file

@ -1,3 +1,4 @@
{{-- See snipeit_modals.js for what powers this --}}
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@ -5,23 +6,25 @@
<h4 class="modal-title">{{ trans('admin/locations/table.create') }}</h4> <h4 class="modal-title">{{ trans('admin/locations/table.create') }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="alert alert-danger" id="modal_error_msg" style="display:none"> <form action="{{ route('api.locations.store') }}" onsubmit="return false">
</div> <div class="alert alert-danger" id="modal_error_msg" style="display:none">
<div class="dynamic-form-row"> </div>
<div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}: <div class="dynamic-form-row">
</label></div> <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
<div class="col-md-8 col-xs-12 required"><input type='text' id='modal-name' class="form-control"></div> </label></div>
</div> <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
</div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-city">{{ trans('general.city') }}:</label></div> <div class="col-md-4 col-xs-12"><label for="modal-city">{{ trans('general.city') }}:</label></div>
<div class="col-md-8 col-xs-12 required"><input type='text' id='modal-city' class="form-control"></div> <div class="col-md-8 col-xs-12 required"><input type='text' name="city" id='modal-city' class="form-control"></div>
</div> </div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12 country"><label for="modal-country">{{ trans('general.country') }}:</label></div> <div class="col-md-4 col-xs-12 country"><label for="modal-country">{{ trans('general.country') }}:</label></div>
<div class="col-md-8 col-xs-12">{!! Form::countries('country', Input::old('country'), 'select2 country',"modal-country") !!}</div> <div class="col-md-8 col-xs-12">{!! Form::countries('country', Input::old('country'), 'select2 country',"modal-country") !!}</div>
</div> </div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">

20
resources/views/modals/manufacturer.blade.php
View file

@ -1,3 +1,4 @@
{{-- See snipeit_modals.js for what powers this --}}
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@ -6,16 +7,17 @@
<h4 class="modal-title">{{ trans('admin/manufacturers/table.create') }}</h4> <h4 class="modal-title">{{ trans('admin/manufacturers/table.create') }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="alert alert-danger" id="modal_error_msg" style="display:none"> <form action="{{ route('api.manufacturers.store') }}" onsubmit="return false">
</div> <div class="alert alert-danger" id="modal_error_msg" style="display:none">
<div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
</label></div>
<div class="col-md-8 col-xs-12 required">
<input type='text' id='modal-name' class="form-control">
</div> </div>
</div> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
</label></div>
<div class="col-md-8 col-xs-12 required">
<input type='text' name="name" id='modal-name' class="form-control">
</div>
</div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>

52
resources/views/modals/model.blade.php
View file

@ -1,3 +1,4 @@
{{-- See snipeit_modals.js for what powers this --}}
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@ -5,35 +6,36 @@
<h4 class="modal-title">{{ trans('admin/models/table.create') }}</h4> <h4 class="modal-title">{{ trans('admin/models/table.create') }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="alert alert-danger" id="modal_error_msg" style="display:none"> <form action="{{ route('api.models.store') }}" onsubmit="return false">
</div> <div class="alert alert-danger" id="modal_error_msg" style="display:none">
<div class="dynamic-form-row"> </div>
<div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}: <div class="dynamic-form-row">
</label></div> <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
<div class="col-md-8 col-xs-12 required"><input type='text' id='modal-name' class="form-control"></div> </label></div>
</div> <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
</div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}: <div class="col-md-4 col-xs-12"><label for="modal-manufacturer_id">{{ trans('general.manufacturer') }}:
</label></div> </label></div>
<div class="col-md-8 col-xs-12 required">{{ Form::select('modal-manufacturer', $manufacturer , '', array('class'=>'select2 parent', 'style'=>'width:100%','id' =>'modal-manufacturer_id')) }}</div> <div class="col-md-8 col-xs-12 required">{{ Form::select('manufacturer_id', $manufacturer , '', array('class'=>'select2 parent', 'style'=>'width:100%','id' =>'modal-manufacturer_id')) }}</div>
</div> </div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}: <div class="col-md-4 col-xs-12"><label for="modal-category_id">{{ trans('general.category') }}:
</label></div> </label></div>
<div class="col-md-8 col-xs-12 required">{{ Form::select('modal-category', $category ,'', array('class'=>'select2 parent', 'style'=>'width:100%','id' => 'modal-category_id')) }}</div> <div class="col-md-8 col-xs-12 required">{{ Form::select('category_id', $category ,'', array('class'=>'select2 parent', 'style'=>'width:100%','id' => 'modal-category_id')) }}</div>
</div> </div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div> <div class="col-md-4 col-xs-12"><label for="modal-modelno">{{ trans('general.model_no') }}:</label></div>
<div class="col-md-8 col-xs-12"><input type='text' id='modal-model_number' class="form-control"></div> <div class="col-md-8 col-xs-12"><input type='text' name="model_number" id='modal-model_number' class="form-control"></div>
</div> </div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div> <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
<div class="col-md-8 col-xs-12">{{ Form::select('custom_fieldset', \App\Helpers\Helper::customFieldsetList(),Input::old('custom_fieldset'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div> <div class="col-md-8 col-xs-12">{{ Form::select('fieldset_id', \App\Helpers\Helper::customFieldsetList(),Input::old('fieldset_id'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:350px')) }}</div>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>

28
resources/views/modals/statuslabel.blade.php
View file

@ -1,3 +1,4 @@
{{-- See snipeit_modals.js for what powers this --}}
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@ -5,20 +6,21 @@
<h4 class="modal-title">{{ trans('admin/statuslabels/table.create') }}</h4> <h4 class="modal-title">{{ trans('admin/statuslabels/table.create') }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="alert alert-danger" id="modal_error_msg" style="display:none"> <form action="{{ route('api.statuslabels.store') }}" onsubmit="return false">
</div> <div class="alert alert-danger" id="modal_error_msg" style="display:none">
<div class="dynamic-form-row"> </div>
<div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}: <div class="dynamic-form-row">
</label></div> <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
<div class="col-md-8 col-xs-12 required"><input type='text' id='modal-name' class="form-control"></div> </label></div>
</div> <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
</div>
<div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-type">{{ trans('admin/statuslabels/table.status_type') }}:
</label></div>
<div class="col-md-8 col-xs-12 required">{{ Form::select('modal-type', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:90%','id' =>'modal-type')) }}</div>
</div>
<div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-type">{{ trans('admin/statuslabels/table.status_type') }}:
</label></div>
<div class="col-md-8 col-xs-12 required">{{ Form::select('type', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:90%','id' =>'modal-type')) }}</div>
</div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>

18
resources/views/modals/supplier.blade.php
View file

@ -1,3 +1,4 @@
{{-- See snipeit_modals.js for what powers this --}}
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
@ -5,14 +6,15 @@
<h4 class="modal-title">{{ trans('admin/suppliers/table.create') }}</h4> <h4 class="modal-title">{{ trans('admin/suppliers/table.create') }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="alert alert-danger" id="modal_error_msg" style="display:none"> <form action="{{ route('api.suppliers.store') }}" onsubmit="return false">
</div> <div class="alert alert-danger" id="modal_error_msg" style="display:none">
<div class="dynamic-form-row"> </div>
<div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}: <div class="dynamic-form-row">
</label></div> <div class="col-md-4 col-xs-12"><label for="modal-name">{{ trans('general.name') }}:
<div class="col-md-8 col-xs-12 required"><input type='text' id='modal-name' class="form-control"></div> </label></div>
</div> <div class="col-md-8 col-xs-12 required"><input type='text' name="name" id='modal-name' class="form-control"></div>
</div>
</form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>

57
resources/views/modals/user.blade.php
View file

@ -1,4 +1,4 @@
{{-- See snipeit_modals.js for what powers this --}}
<script src="/js/pGenerator.jquery.js"></script> <script src="/js/pGenerator.jquery.js"></script>
<script nonce="{{ csrf_token() }}"> <script nonce="{{ csrf_token() }}">
@ -26,38 +26,39 @@
<h4 class="modal-title">{{ trans('admin/users/table.createuser') }}</h4> <h4 class="modal-title">{{ trans('admin/users/table.createuser') }}</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="alert alert-danger" id="modal_error_msg" style="display:none"> <form action="{{ route('api.users.store') }}" onsubmit="return false">
</div> <div class="alert alert-danger" id="modal_error_msg" style="display:none">
<div class="dynamic-form-row"> </div>
<div class="col-md-4 col-xs-12"><label for="modal-first_name">{{ trans('general.first_name') }}:</label></div> <div class="dynamic-form-row">
<div class="col-md-8 col-xs-12 required"><input type='text' id='modal-first_name' class="form-control"></div> <div class="col-md-4 col-xs-12"><label for="modal-first_name">{{ trans('general.first_name') }}:</label></div>
</div> <div class="col-md-8 col-xs-12 required"><input type='text' name="first_name" id='modal-first_name' class="form-control"></div>
</div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-last_name">{{ trans('general.last_name') }}:</label></div> <div class="col-md-4 col-xs-12"><label for="modal-last_name">{{ trans('general.last_name') }}:</label></div>
<div class="col-md-8 col-xs-12"><input type='text' id='modal-last_name' class="form-control"> </div> <div class="col-md-8 col-xs-12"><input type='text' name="last_name" id='modal-last_name' class="form-control"> </div>
</div> </div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-username">{{ trans('admin/users/table.username') }}:</label></div> <div class="col-md-4 col-xs-12"><label for="modal-username">{{ trans('admin/users/table.username') }}:</label></div>
<div class="col-md-8 col-xs-12 required"><input type='text' id='modal-username' class="form-control"></div> <div class="col-md-8 col-xs-12 required"><input type='text' name="username" id='modal-username' class="form-control"></div>
</div> </div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-password">{{ trans('admin/users/table.password') }}:</label></div> <div class="col-md-4 col-xs-12"><label for="modal-password">{{ trans('admin/users/table.password') }}:</label></div>
<div class="col-md-8 col-xs-12 required"><input type='password' id='modal-password' class="form-control"> <div class="col-md-8 col-xs-12 required"><input type='password' name="password" id='modal-password' class="form-control">
<a href="#" class="left" id="genPassword">Generate</a> <a href="#" class="left" id="genPassword">Generate</a>
</div> </div>
</div> </div>
<div class="dynamic-form-row"> <div class="dynamic-form-row">
<div class="col-md-4 col-xs-12"><label for="modal-password_confirm">{{ trans('admin/users/table.password_confirm') }}:</label></div> <div class="col-md-4 col-xs-12"><label for="modal-password_confirm">{{ trans('admin/users/table.password_confirm') }}:</label></div>
<div class="col-md-8 col-xs-12 required"><input type='password' id='modal-password_confirm' class="form-control"> <div class="col-md-8 col-xs-12 required"><input type='password' name="password_confirm" id='modal-password_confirm' class="form-control">
<div id="generated-password"></div> <div id="generated-password"></div>
</div> </div>
</div>
</form>
</div> </div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button> <button type="button" class="btn btn-default" data-dismiss="modal">{{ trans('button.cancel') }}</button>
<button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button> <button type="button" class="btn btn-primary" id="modal-save">{{ trans('general.save') }}</button>

2
resources/views/models/edit.blade.php
View file

@ -11,7 +11,7 @@
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/models/table.name')]) @include ('partials.forms.edit.name', ['translated_name' => trans('admin/models/table.name')])
@include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true']) @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id', 'required' => 'true'])
@include ('partials.forms.edit.category-select', ['translated_name' => trans('admin/categories/general.category_name'), 'fieldname' => 'category_id', 'required' => 'true']) @include ('partials.forms.edit.category-select', ['translated_name' => trans('admin/categories/general.category_name'), 'fieldname' => 'category_id', 'required' => 'true', 'category_type' => 'asset'])
@include ('partials.forms.edit.model_number') @include ('partials.forms.edit.model_number')
@include ('partials.forms.edit.depreciation') @include ('partials.forms.edit.depreciation')

2
resources/views/partials/forms/edit/category-select.blade.php
View file

@ -18,7 +18,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Category::class) @can('create', \App\Models\Category::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.category') }}' data-toggle="modal" data-target="#createModal" data-dependency="categorie" data-select='category_select_id' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.category',['category_type' => isset($category_type) ? $category_type : 'assets' ]) }}' data-toggle="modal" data-target="#createModal" data-select='category_select_id' class="btn btn-sm btn-default">New</a>
@endif @endif
@endcan @endcan
</div> </div>

2
resources/views/partials/forms/edit/location-select.blade.php
View file

@ -17,7 +17,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Location::class) @can('create', \App\Models\Location::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.location') }}' data-toggle="modal" data-target="#createModal" data-dependency="location" data-select='{{ $fieldname }}_location_select' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.location') }}' data-toggle="modal" data-target="#createModal" data-select='{{ $fieldname }}_location_select' class="btn btn-sm btn-default">New</a>
@endif @endif
@endcan @endcan
</div> </div>

2
resources/views/partials/forms/edit/manufacturer-select.blade.php
View file

@ -19,7 +19,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Manufacturer::class) @can('create', \App\Models\Manufacturer::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.manufacturer') }}' data-toggle="modal" data-target="#createModal" data-dependency="manufacturer" data-select='manufacturer_select_id' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.manufacturer') }}' data-toggle="modal" data-target="#createModal" data-select='manufacturer_select_id' class="btn btn-sm btn-default">New</a>
@endif @endif
@endcan @endcan
</div> </div>

2
resources/views/partials/forms/edit/model-select.blade.php
View file

@ -18,7 +18,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\AssetModel::class) @can('create', \App\Models\AssetModel::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.model') }}' data-toggle="modal" data-target="#createModal" data-dependency="model" data-select='model_select_id' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.model') }}' data-toggle="modal" data-target="#createModal" data-select='model_select_id' class="btn btn-sm btn-default">New</a>
<span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span> <span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
@endif @endif
@endcan @endcan

2
resources/views/partials/forms/edit/status.blade.php
View file

@ -6,7 +6,7 @@
{!! $errors->first('status_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!} {!! $errors->first('status_id', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
</div> </div>
<div class="col-md-2 col-sm-2 text-left"> <div class="col-md-2 col-sm-2 text-left">
<a href='{{ route('modal.statuslabel') }}' data-toggle="modal" data-target="#createModal" data-dependency='statuslabel' data-select='status_select_id' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.statuslabel') }}' data-toggle="modal" data-target="#createModal" data-select='status_select_id' class="btn btn-sm btn-default">New</a>
<span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span> <span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
</div> </div>

2
resources/views/partials/forms/edit/supplier-select.blade.php
View file

@ -17,7 +17,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\Supplier::class) @can('create', \App\Models\Supplier::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.supplier') }}' data-toggle="modal" data-target="#createModal" data-dependency="supplier" data-select='supplier_select' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.supplier') }}' data-toggle="modal" data-target="#createModal" data-select='supplier_select' class="btn btn-sm btn-default">New</a>
@endif @endif
@endcan @endcan
</div> </div>

2
resources/views/partials/forms/edit/user-select.blade.php
View file

@ -17,7 +17,7 @@
<div class="col-md-1 col-sm-1 text-left"> <div class="col-md-1 col-sm-1 text-left">
@can('create', \App\Models\User::class) @can('create', \App\Models\User::class)
@if ((!isset($hide_new)) || ($hide_new!='true')) @if ((!isset($hide_new)) || ($hide_new!='true'))
<a href='{{ route('modal.user') }}' data-toggle="modal" data-target="#createModal" data-dependency="user" data-select='assigned_user_select' class="btn btn-sm btn-default">New</a> <a href='{{ route('modal.user') }}' data-toggle="modal" data-target="#createModal" data-select='assigned_user_select' class="btn btn-sm btn-default">New</a>
@endif @endif
@endcan @endcan
</div> </div>