A free open source IT asset/license management system
Make table blades more flexible
snipeb2ec69ce7f08
diff --git a/resources/views/blade/table/accessories.blade.php b/resources/views/blade/table/accessories.blade.phpindex e18c2654c2..990c0ad526 100644--- a/resources/views/blade/table/accessories.blade.php+++ b/resources/views/blade/table/accessories.blade.php@@ -1,24 +1,33 @@-@aware(['fixed_right_number'])+@props([+ 'route' => null,+ 'name' => 'default',+ 'presenter' => \App\Presenters\AccessoryPresenter::dataTableLayout(),+ 'fixed_right_number' => 2,+ 'fixed_number' => 1,+ 'table_header' => trans('general.accessories'),+])++@aware(['name'])<!-- start accessories tab pane -->@can('view', \App\Models\Accessory::class)- <x-slot:header>- {{ trans('general.accessories') }}- </x-slot:header>+ <x-slot:table_header>+ {{ $table_header }}+ </x-slot:table_header>- <x-slot:content>- <x-table- show_column_search="true"- fixed_right_number="2"- fixed_number="1"- show_advanced_search="true"- buttons="accessoryButtons"- api_url="{{ $route }}"- :presenter="\App\Presenters\AccessoryPresenter::dataTableLayout()"- export_filename="export-{{ str_slug($name) }}-accessories-{{ date('Y-m-d') }}"- />- </x-slot:content>+ <x-slot:content>+ <x-table+ :$presenter+ :$fixed_right_number+ :$fixed_number+ show_column_search="true"+ show_advanced_search="true"+ buttons="accessoryButtons"+ api_url="{{ $route }}"+ export_filename="export-{{ str_slug($name) }}-accessories-{{ date('Y-m-d') }}"+ />+ </x-slot:content>@endcan<!-- end accessories tab pane -->\ No newline at end of filediff --git a/resources/views/blade/table/assets.blade.php b/resources/views/blade/table/assets.blade.phpindex 322d757687..c0d2da0228 100644--- a/resources/views/blade/table/assets.blade.php+++ b/resources/views/blade/table/assets.blade.php@@ -1,30 +1,38 @@@props(['route' => null,'name' => 'default',+ 'presenter' => \App\Presenters\AssetPresenter::dataTableLayout(),+ 'fixed_right_number' => 2,+ 'fixed_number' => 1,+ 'table_header' => trans('general.assets'),])+@aware(['name'])++<!-- start assets tab pane -->@can('view', \App\Models\Asset::class)- <x-slot:header>- {{ trans('general.assets') }}- </x-slot:header>+ <x-slot:table_header>+ {{ $table_header }}+ </x-slot:table_header>- <x-slot:bulkactions>- <x-table.bulk-assets />- </x-slot:bulkactions>+ <x-slot:bulkactions>+ <x-table.bulk-assets/>+ </x-slot:bulkactions>- <x-slot:content>- <x-table- show_column_search="true"- show_advanced_search="true"- fixed_right_number="2"- buttons="assetButtons"- api_url="{{ $route }}"- :presenter="\App\Presenters\AssetPresenter::dataTableLayout()"- export_filename="export-{{ str_slug($name) }}-assets-{{ date('Y-m-d') }}"- />- </x-slot:content>+ <x-slot:content>+ <x-table+ :$presenter+ :$fixed_right_number+ :$fixed_number+ show_column_search="true"+ show_advanced_search="true"+ buttons="assetButtons"+ api_url="{{ $route }}"+ export_filename="export-{{ str_slug($name) }}-assets-{{ date('Y-m-d') }}"+ />+ </x-slot:content>@endcan<!-- end assets tab pane -->\ No newline at end of filediff --git a/resources/views/blade/table/components.blade.php b/resources/views/blade/table/components.blade.phpindex ba542635b3..7a2a8334e7 100644--- a/resources/views/blade/table/components.blade.php+++ b/resources/views/blade/table/components.blade.php@@ -1,22 +1,29 @@@props(['route' => null,'name' => 'default',+ 'presenter' => \App\Presenters\ComponentPresenter::dataTableLayout(),+ 'fixed_right_number' => 2,+ 'fixed_number' => 1,+ 'table_header' => trans('general.components'),])<!-- start components tab pane -->@can('view', \App\Models\Component::class)- <x-slot:header>- {{ trans('general.components') }}- </x-slot:header>++ <x-slot:table_header>+ {{ $table_header }}+ </x-slot:table_header><x-slot:content><x-table- show_column_search="true"- show_advanced_search="true"- buttons="componentButtons"- api_url="{{ $route }}"- :presenter="\App\Presenters\ComponentPresenter::dataTableLayout()"- export_filename="export-{{ str_slug($name) }}-components-{{ date('Y-m-d') }}"+ :$presenter+ :$fixed_right_number+ :$fixed_number+ show_column_search="true"+ show_advanced_search="true"+ buttons="componentButtons"+ api_url="{{ $route }}"+ export_filename="export-{{ str_slug($name) }}-components-{{ date('Y-m-d') }}"/></x-slot:content>@endcandiff --git a/resources/views/blade/table/consumables.blade.php b/resources/views/blade/table/consumables.blade.phpindex 16b9244b93..93bd9b62da 100644--- a/resources/views/blade/table/consumables.blade.php+++ b/resources/views/blade/table/consumables.blade.php@@ -1,23 +1,29 @@@props(['route' => null,'name' => 'default',+ 'presenter' => \App\Presenters\ConsumablePresenter::dataTableLayout(),+ 'fixed_right_number' => 2,+ 'fixed_number' => 1,+ 'table_header' => trans('general.consumables'),])<!-- start consumables tab pane -->@can('view', \App\Models\Consumable::class)- <x-slot:header>- {{ trans('general.consumables') }}- </x-slot:header>+ <x-slot:table_header>+ {{ $table_header }}+ </x-slot:table_header><x-slot:content><x-table- show_column_search="true"- show_advanced_search="true"- buttons="consumableButtons"- api_url="{{ $route }}"- :presenter="\App\Presenters\ConsumablePresenter::dataTableLayout()"- export_filename="export-{{ str_slug($name) }}-consumables-{{ date('Y-m-d') }}"+ :$presenter+ :$fixed_right_number+ :$fixed_number+ show_column_search="true"+ show_advanced_search="true"+ buttons="consumableButtons"+ api_url="{{ $route }}"+ export_filename="export-{{ str_slug($name) }}-consumables-{{ date('Y-m-d') }}"/></x-slot:content>diff --git a/resources/views/blade/table/index.blade.php b/resources/views/blade/table/index.blade.phpindex d753e486c7..e9d6a1ef22 100644--- a/resources/views/blade/table/index.blade.php+++ b/resources/views/blade/table/index.blade.php@@ -3,14 +3,14 @@'buttons' => null,'export_filename' => 'export-'.date('Y-m-d'),'api_url' => null,- 'show_column_search' => false,- 'show_advanced_search' => false,+ 'show_column_search' => null,+ 'show_advanced_search' => null,'show_search' => true,- 'fixed_number' => false,- 'fixed_right_number' => false,+ 'fixed_number' => null,+ 'fixed_right_number' => null,'sort_order' => 'asc','sort_field' => 'name',-+ 'nosticky' => false,])@aware(['name'])@@ -35,6 +35,8 @@data-columns="{{ $presenter }}"@endif+ data-fixed-columns="{{ (($fixed_number) || ($fixed_right_number) || ($nosticky!='true')) ? 'true' : 'false' }}"+@if ($fixed_number)data-fixed-number="{{ $fixed_number }}"@endifdiff --git a/resources/views/blade/table/licenses.blade.php b/resources/views/blade/table/licenses.blade.phpindex 8a7e212d8b..d436c74bc2 100644--- a/resources/views/blade/table/licenses.blade.php+++ b/resources/views/blade/table/licenses.blade.php@@ -1,24 +1,29 @@@props(['route' => null,'name' => 'default',+ 'presenter' => \App\Presenters\LicensePresenter::dataTableLayout(),+ 'fixed_right_number' => 2,+ 'fixed_number' => 1,+ 'table_header' => trans('general.licenses'),])+<!-- start licenses tab pane -->@can('view', \App\Models\License::class)- <x-slot:header>- {{ trans('general.licenses') }}- </x-slot:header>+ <x-slot:table_header>+ {{ $table_header }}+ </x-slot:table_header><x-slot:content><x-table- show_column_search="true"- show_advanced_search="true"- buttons="licenseButtons"- fixed_right_number="2"- fixed_number="1"- api_url="{{ $route }}"- :presenter="\App\Presenters\LicensePresenter::dataTableLayout()"- export_filename="export-{{ str_slug($name) }}-licenses-{{ date('Y-m-d') }}"+ :$presenter+ :$fixed_right_number+ :$fixed_number+ show_column_search="true"+ show_advanced_search="true"+ buttons="licenseButtons"+ api_url="{{ $route }}"+ export_filename="export-{{ str_slug($name) }}-licenses-{{ date('Y-m-d') }}"/></x-slot:content>diff --git a/resources/views/blade/table/locations.blade.php b/resources/views/blade/table/locations.blade.phpindex 78f1dba4a9..1468851c66 100644--- a/resources/views/blade/table/locations.blade.php+++ b/resources/views/blade/table/locations.blade.php@@ -1,28 +1,33 @@@props(['route' => null,'name' => 'default',+ 'presenter' => \App\Presenters\LocationPresenter::dataTableLayout(),+ 'fixed_right_number' => 1,+ 'table_header' => trans('general.locations'),])<!-- start locations tab pane -->@can('view', \App\Models\Location::class)<x-slot:header>- {{ trans('general.locations') }}+ {{ $table_header }}</x-slot:header>- @include('partials.locations-bulk-actions')+ <x-slot:bulkactions>+ @include('partials.locations-bulk-actions')+ </x-slot:bulkactions><x-slot:content><x-table- show_column_search="true"- show_advanced_search="true"- fixed_right_number="2"- buttons="locationButtons"- api_url="{{ $route }}"- :presenter="\App\Presenters\LocationPresenter::dataTableLayout()"- export_filename="export-{{ str_slug($name) }}-locations-{{ date('Y-m-d') }}"+ :$presenter+ :$fixed_right_number+ show_column_search="true"+ show_advanced_search="true"+ buttons="locationButtons"+ api_url="{{ $route }}"+ export_filename="export-{{ str_slug($name) }}-locations-{{ date('Y-m-d') }}"/></x-slot:content>@endcan-<!-- end assets tab pane -->\ No newline at end of file+<!-- end locations tab pane -->\ No newline at end of file