mirror of
https://github.com/snipe/snipe-it.git
synced 2024-09-21 00:07:42 -07:00
296de34e8a
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell. * Upgraded framework to Laravel 6 ### TO DO: - Fix password restriction rules- the old library isn’t compatible with Laravel 6 :( - Figure out why in-app API calls are returning “Unauthorized” * More updates from Input:: to Request:: helper * Switch to Request:: from Input * Added passport config * Fixed goofy password minimum in seeder * Added laravel/helpers * Changed ($item) to ($item->id) in forms I have no idea why this is necessary * Changed ($item) to ($item->id) in forms * Updated API middleware to auth:api * Updated with added laravel auth.php values * FIxed *&!^$%^&$^%!!!! ajax issue * Switch to Request::get from Input::get * Switched to Request facade * Added password security minimums back in The package we were using has not been updated to Laravel v6, so I created custom validators instead * Added language strings for error messages for password rules * Fixed `($item)` issue in formActions for partials
66 lines
2 KiB
PHP
Executable file
66 lines
2 KiB
PHP
Executable file
@extends('layouts/default')
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
{{ trans('admin/manufacturers/table.asset_manufacturers') }}
|
|
@parent
|
|
@stop
|
|
|
|
{{-- Page title --}}
|
|
@section('header_right')
|
|
@can('create', \App\Models\Manufacturer::class)
|
|
<a href="{{ route('manufacturers.create') }}" class="btn btn-primary pull-right">
|
|
{{ trans('general.create') }}</a>
|
|
@endcan
|
|
|
|
@if (Request::get('deleted')=='true')
|
|
<a class="btn btn-default pull-right" href="{{ route('manufacturers.index') }}" style="margin-right: 5px;">{{ trans('general.show_current') }}</a>
|
|
@else
|
|
<a class="btn btn-default pull-right" href="{{ route('manufacturers.index', ['deleted' => 'true']) }}" style="margin-right: 5px;">
|
|
{{ trans('general.show_deleted') }}</a>
|
|
@endif
|
|
|
|
@stop
|
|
|
|
{{-- Page content --}}
|
|
@section('content')
|
|
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<div class="box box-default">
|
|
<div class="box-body">
|
|
<div class="table-responsive">
|
|
|
|
<table
|
|
data-columns="{{ \App\Presenters\ManufacturerPresenter::dataTableLayout() }}"
|
|
data-cookie-id-table="manufacturersTable"
|
|
data-pagination="true"
|
|
data-id-table="manufacturersTable"
|
|
data-search="true"
|
|
data-show-footer="true"
|
|
data-side-pagination="server"
|
|
data-show-columns="true"
|
|
data-show-export="true"
|
|
data-show-refresh="true"
|
|
data-sort-order="asc"
|
|
id="manufacturersTable"
|
|
class="table table-striped snipe-table"
|
|
data-url="{{route('api.manufacturers.index', ['deleted' => e(Request::get('deleted')) ]) }}"
|
|
data-export-options='{
|
|
"fileName": "export-manufacturers-{{ date('Y-m-d') }}",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'>
|
|
|
|
</table>
|
|
</div>
|
|
</div><!-- /.box-body -->
|
|
</div><!-- /.box -->
|
|
</div>
|
|
</div>
|
|
|
|
@stop
|
|
|
|
@section('moar_scripts')
|
|
@include ('partials.bootstrap-table')
|
|
@stop
|