A free open source IT asset/license management system
Removed erroneous content slot
snipe29559485e22f
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.phpindex c3975a6d01..900cf8df23 100644--- a/resources/views/accessories/view.blade.php+++ b/resources/views/accessories/view.blade.php@@ -39,13 +39,13 @@<x-slot:table_header>{{ trans('general.checked_out') }}</x-slot:table_header>- <x-slot:content>- <x-table- api_url="{{ route('api.accessories.checkedout', $accessory->id) }}"- :presenter="\App\Presenters\AccessoryPresenter::assignedDataTableLayout()"- export_filename="export-{{ str_slug($accessory->name) }}-assets-{{ date('Y-m-d') }}"- />- </x-slot:content>++ <x-table+ api_url="{{ route('api.accessories.checkedout', $accessory->id) }}"+ :presenter="\App\Presenters\AccessoryPresenter::assignedDataTableLayout()"+ export_filename="export-{{ str_slug($accessory->name) }}-assets-{{ date('Y-m-d') }}"+ />+</x-tabs.pane><!-- end assigned tab pane -->@@ -54,14 +54,14 @@<x-slot:table_header>{{ trans('general.history') }}</x-slot:table_header>- <x-slot:content>- <x-table- name="accessoryHistory"- api_url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}"- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"- export_filename="export-accessory-{{ str_slug($accessory->name) }}-{{ date('Y-m-d') }}"- />- </x-slot:content>++ <x-table+ name="accessoryHistory"+ api_url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}"+ :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"+ export_filename="export-accessory-{{ str_slug($accessory->name) }}-{{ date('Y-m-d') }}"+ />+</x-tabs.pane><!-- end history tab pane -->@@ -71,9 +71,8 @@<x-slot:table_header>{{ trans('general.files') }}</x-slot:table_header>- <x-slot:content>- <x-table.files object_type="accessories" :object="$accessory"/>- </x-slot:content>++ <x-table.files object_type="accessories" :object="$accessory"/></x-tabs.pane>@endcan<!-- end files tab pane -->diff --git a/resources/views/blade/box/index.blade.php b/resources/views/blade/box/index.blade.phpindex b8a29a396c..163532d903 100644--- a/resources/views/blade/box/index.blade.php+++ b/resources/views/blade/box/index.blade.php@@ -19,16 +19,19 @@<div class="box-body">+ @if (isset($table_header))+ <h3 class="box-title{{ (!isset($bulkactions)) ? ' pull-left' : '' }}">+ {{ $table_header }}+ </h3>+ @endif++@if (isset($bulkactions))<div id="{{ Illuminate\Support\Str::camel($name) }}ToolBar" class="pull-left" style="min-width:500px !important; padding-top: 10px;">{{ $bulkactions }}</div>@endif- @if ((isset($content)) && (!$content->isEmpty()))- {{ $content }}- @endif-@if (($slot) && (!$slot->isEmpty())){{ $slot }}@endifdiff --git a/resources/views/blade/table/accessories.blade.php b/resources/views/blade/table/accessories.blade.phpindex 463fe426b1..5bab0ba332 100644--- a/resources/views/blade/table/accessories.blade.php+++ b/resources/views/blade/table/accessories.blade.php@@ -15,19 +15,17 @@<x-slot:table_header>{{ $table_header }}</x-slot:table_header>-- <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>++ <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') }}"+ />@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 f85cd88755..f51f3705c4 100644--- a/resources/views/blade/table/assets.blade.php+++ b/resources/views/blade/table/assets.blade.php@@ -20,19 +20,17 @@<x-slot:bulkactions><x-table.bulk-assets/></x-slot:bulkactions>-- <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>++ <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') }}"+ />@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 ad60ef9317..8f45d6a779 100644--- a/resources/views/blade/table/components.blade.php+++ b/resources/views/blade/table/components.blade.php@@ -14,17 +14,17 @@{{ $table_header }}</x-slot:table_header>- <x-slot:content>- <x-table- :$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>++ <x-table+ :$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') }}"+ />+@endcan<!-- end components tab pane -->\ No newline at end of filediff --git a/resources/views/blade/table/consumables.blade.php b/resources/views/blade/table/consumables.blade.phpindex 2b775f288f..1446296bca 100644--- a/resources/views/blade/table/consumables.blade.php+++ b/resources/views/blade/table/consumables.blade.php@@ -14,18 +14,16 @@{{ $table_header }}</x-slot:table_header>- <x-slot:content>- <x-table- :$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>+ <x-table+ :$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') }}"+ />@endcan<!-- end consumables tab pane -->\ No newline at end of filediff --git a/resources/views/blade/table/licenses.blade.php b/resources/views/blade/table/licenses.blade.phpindex ad4c343d77..4595192215 100644--- a/resources/views/blade/table/licenses.blade.php+++ b/resources/views/blade/table/licenses.blade.php@@ -14,18 +14,18 @@{{ $table_header }}</x-slot:table_header>- <x-slot:content>- <x-table- :$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>++ <x-table+ :$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') }}"+ />+@endcan<!-- end licenses tab pane -->\ No newline at end of filediff --git a/resources/views/blade/table/locations.blade.php b/resources/views/blade/table/locations.blade.phpindex 948d1c8ba7..e0b1786f11 100644--- a/resources/views/blade/table/locations.blade.php+++ b/resources/views/blade/table/locations.blade.php@@ -16,18 +16,17 @@<x-slot:bulkactions>@include('partials.locations-bulk-actions')</x-slot:bulkactions>++ <x-table+ :$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>- <x-table- :$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 locations tab pane -->\ No newline at end of filediff --git a/resources/views/blade/table/models.blade.php b/resources/views/blade/table/models.blade.phpindex b3dae52e62..1b83177388 100644--- a/resources/views/blade/table/models.blade.php+++ b/resources/views/blade/table/models.blade.php@@ -16,17 +16,16 @@<x-slot:bulkactions><x-table.bulk-users/></x-slot:bulkactions>++ <x-table+ :$presenter+ :$fixed_right_number+ :$fixed_number+ buttons="modelButtons"+ api_url="{{ $route }}"+ export_filename="export-models-{{ date('Y-m-d') }}"+ />- <x-slot:content>- <x-table- :$presenter- :$fixed_right_number- :$fixed_number- buttons="modelButtons"- api_url="{{ $route }}"- export_filename="export-models-{{ date('Y-m-d') }}"- />- </x-slot:content>@endcan<!-- end assets tab pane -->\ No newline at end of filediff --git a/resources/views/blade/table/users.blade.php b/resources/views/blade/table/users.blade.phpindex bd4b840191..e29675e468 100644--- a/resources/views/blade/table/users.blade.php+++ b/resources/views/blade/table/users.blade.php@@ -17,18 +17,17 @@<x-table.bulk-users/></x-slot:bulkactions>- <x-slot:content>- <x-table- :$presenter- :$fixed_right_number- :$fixed_number- show_column_search="true"- show_advanced_search="true"- buttons="userButtons"- api_url="{{ $route }}"- export_filename="export-users-{{ date('Y-m-d') }}"- />- </x-slot:content>+ <x-table+ :$presenter+ :$fixed_right_number+ :$fixed_number+ show_column_search="true"+ show_advanced_search="true"+ buttons="userButtons"+ api_url="{{ $route }}"+ export_filename="export-users-{{ date('Y-m-d') }}"+ />+@endcan<!-- end assets tab pane -->\ No newline at end of filediff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.phpindex 5d76f9d290..36468476d8 100644--- a/resources/views/components/view.blade.php+++ b/resources/views/components/view.blade.php@@ -41,21 +41,20 @@{{ trans('general.assigned') }}</x-slot:table_header>- <x-slot:content>- <x-table- :presenter="\App\Presenters\ComponentPresenter::checkedOut()"- :api_url="route('api.components.assets', $snipe_component)"- />- </x-slot:content>+ <x-table+ :presenter="\App\Presenters\ComponentPresenter::checkedOut()"+ :api_url="route('api.components.assets', $snipe_component)"+ />+</x-tabs.pane><x-tabs.pane name="files"><x-slot:table_header>{{ trans('general.files') }}</x-slot:table_header>- <x-slot:content>- <x-table.files object_type="components" :object="$snipe_component" />- </x-slot:content>++ <x-table.files object_type="components" :object="$snipe_component"/>+</x-tabs.pane><!-- start history tab pane -->@@ -63,14 +62,13 @@<x-slot:table_header>{{ trans('general.history') }}</x-slot:table_header>- <x-slot:content>- <x-table- name="componentHistory"- api_url="{{ route('api.activity.index', ['item_id' => $snipe_component->id, 'item_type' => 'component']) }}"- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"- export_filename="export-licenses-{{ str_slug($snipe_component->name) }}-{{ date('Y-m-d') }}"- />- </x-slot:content>++ <x-table+ name="componentHistory"+ api_url="{{ route('api.activity.index', ['item_id' => $snipe_component->id, 'item_type' => 'component']) }}"+ :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"+ export_filename="export-licenses-{{ str_slug($snipe_component->name) }}-{{ date('Y-m-d') }}"+ /></x-tabs.pane></x-slot:tabpanes></x-tabs>diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.phpindex 4cede42061..d02b026d85 100644--- a/resources/views/consumables/view.blade.php+++ b/resources/views/consumables/view.blade.php@@ -42,12 +42,10 @@<x-tabs.pane name="assigned" class="in active">- <x-slot:content>- <x-table- :presenter="\App\Presenters\ConsumablePresenter::checkedOut()"- :api_url="route('api.consumables.show.users', $consumable->id)"- />- </x-slot:content>+ <x-table+ :presenter="\App\Presenters\ConsumablePresenter::checkedOut()"+ :api_url="route('api.consumables.show.users', $consumable->id)"+ /></x-tabs.pane>@@ -55,9 +53,8 @@<x-slot:table_header>{{ trans('general.files') }}</x-slot:table_header>- <x-slot:content>- <x-table.files object_type="consumables" :object="$consumable" />- </x-slot:content>++ <x-table.files object_type="consumables" :object="$consumable"/></x-tabs.pane><!-- start history tab pane -->@@ -65,14 +62,13 @@<x-slot:table_header>{{ trans('general.history') }}</x-slot:table_header>- <x-slot:content>- <x-table- name="consumableHistory"- api_url="{{ route('api.activity.index', ['item_id' => $consumable->id, 'item_type' => 'consumable']) }}"- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"- export_filename="export-licenses-{{ str_slug($consumable->name) }}-{{ date('Y-m-d') }}"- />- </x-slot:content>++ <x-table+ name="consumableHistory"+ api_url="{{ route('api.activity.index', ['item_id' => $consumable->id, 'item_type' => 'consumable']) }}"+ :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"+ export_filename="export-licenses-{{ str_slug($consumable->name) }}-{{ date('Y-m-d') }}"+ /></x-tabs.pane></x-slot:tabpanes>diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.phpindex 3a779dd9b5..ec135bd5c2 100644--- a/resources/views/depreciations/view.blade.php+++ b/resources/views/depreciations/view.blade.php@@ -54,48 +54,17 @@<x-slot:tabpanes><!-- start assets tab pane -->- @can('view', \App\Models\Asset::class)- <x-tabs.pane name="assets" class="in active">- <x-slot:table_header>- {{ trans('general.assets') }}- </x-slot:table_header>+ <x-tabs.pane name="assets">+ <x-table.assets name="assets" :route="route('api.assets.index', ['depreciation_id' => $depreciation->id])"/>+ </x-tabs.pane>+ <!-- end assets tab pane -->- <x-slot:bulkactions>- <x-table.bulk-assets />- </x-slot:bulkactions>-- <x-slot:content>- <x-table- show_column_search="true"- show_advanced_search="true"- buttons="assetButtons"- api_url="{{ route('api.assets.index', ['depreciation_id' => $depreciation->id]) }}"- :presenter="\App\Presenters\AssetPresenter::dataTableLayout()"- export_filename="export-depreciation-{{ str_slug($depreciation->name) }}-assets-{{ date('Y-m-d') }}"- />- </x-slot:content>- </x-tabs.pane>- <!-- end assets tab pane -->- @endcan<!-- start licenses tab pane -->- @can('view', \App\Models\License::class)- <x-tabs.pane name="licenses">- <x-slot:table_header>- {{ trans('general.licenses') }}- </x-slot:table_header>- <x-slot:content>- <x-table- name="licenses"- buttons="licenseButtons"- api_url="{{ route('api.licenses.index', ['depreciation_id' => $depreciation->id]) }}"- :presenter="\App\Presenters\LicensePresenter::dataTableLayout()"- export_filename="export-depreciation-{{ str_slug($depreciation->name) }}-licences-{{ date('Y-m-d') }}"- />- </x-slot:content>- </x-tabs.pane>- @endcan+ <x-tabs.pane name="licenses">+ <x-table.licenses name="licenses" :route="route('api.licenses.index', ['depreciation_id' => $depreciation->id])"/>+ </x-tabs.pane><!-- end licenses tab pane --><!-- start models tab pane -->@@ -104,15 +73,14 @@<x-slot:table_header>{{ trans('general.models') }}</x-slot:table_header>- <x-slot:content>- <x-table- name="models"- buttons="modelButtons"- api_url="{{ route('api.models.index', ['depreciation_id' => $depreciation->id]) }}"- :presenter="\App\Presenters\AssetModelPresenter::dataTableLayout()"- export_filename="export-depreciation-{{ str_slug($depreciation->name) }}-models-{{ date('Y-m-d') }}"- />- </x-slot:content>+ <x-table+ name="models"+ buttons="modelButtons"+ api_url="{{ route('api.models.index', ['depreciation_id' => $depreciation->id]) }}"+ :presenter="\App\Presenters\AssetModelPresenter::dataTableLayout()"+ export_filename="export-depreciation-{{ str_slug($depreciation->name) }}-models-{{ date('Y-m-d') }}"+ />+</x-tabs.pane>@endcan<!-- end licenses tab pane -->diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.phpindex e4e4755a0e..7d9d175df7 100755--- a/resources/views/licenses/view.blade.php+++ b/resources/views/licenses/view.blade.php@@ -59,17 +59,15 @@<x-slot:table_header>{{ trans('general.assigned') }}</x-slot:table_header>- <x-slot:content>- <x-table- fixed_right_number="1"- fixed_number="1"- api_url="{{ route('api.licenses.seats.index', [$license->id, 'status' => 'assigned']) }}"- :presenter="\App\Presenters\LicensePresenter::dataTableLayoutSeats()"- export_filename="export-{{ str_slug($license->name) }}-assigned-{{ date('Y-m-d') }}"- />+ <x-table+ fixed_right_number="1"+ fixed_number="1"+ api_url="{{ route('api.licenses.seats.index', [$license->id, 'status' => 'assigned']) }}"+ :presenter="\App\Presenters\LicensePresenter::dataTableLayoutSeats()"+ export_filename="export-{{ str_slug($license->name) }}-assigned-{{ date('Y-m-d') }}"+ />- </x-slot:content></x-tabs.pane>@@ -77,16 +75,14 @@<x-slot:table_header>{{ trans('general.available') }}</x-slot:table_header>- <x-slot:content>- <x-table- show_search="false"- api_url="{{ route('api.licenses.seats.index', [$license->id, 'status' => 'available']) }}"- :presenter="\App\Presenters\LicensePresenter::dataTableLayoutSeats()"- export_filename="export-{{ str_slug($license->name) }}-available-{{ date('Y-m-d') }}"- />+ <x-table+ show_search="false"+ api_url="{{ route('api.licenses.seats.index', [$license->id, 'status' => 'available']) }}"+ :presenter="\App\Presenters\LicensePresenter::dataTableLayoutSeats()"+ export_filename="export-{{ str_slug($license->name) }}-available-{{ date('Y-m-d') }}"+ />- </x-slot:content></x-tabs.pane>@@ -95,14 +91,14 @@<x-slot:table_header>{{ trans('general.history') }}</x-slot:table_header>- <x-slot:content>- <x-table- name="locationHistory_{{ $license->id }}"- api_url="{{ route('api.activity.index', ['item_id' => $license->id, 'item_type' => 'license']) }}"- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"- export_filename="export-licenses-{{ str_slug($license->name) }}-{{ date('Y-m-d') }}"- />- </x-slot:content>++ <x-table+ name="locationHistory_{{ $license->id }}"+ api_url="{{ route('api.activity.index', ['item_id' => $license->id, 'item_type' => 'license']) }}"+ :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"+ export_filename="export-licenses-{{ str_slug($license->name) }}-{{ date('Y-m-d') }}"+ />+</x-tabs.pane><!-- end history tab pane -->@@ -113,9 +109,9 @@<x-slot:table_header>{{ trans('general.files') }}</x-slot:table_header>- <x-slot:content>- <x-table.files object_type="licenses" :object="$license" />- </x-slot:content>++ <x-table.files object_type="licenses" :object="$license" />+</x-tabs.pane>@endcan<!-- end files tab pane -->diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.phpindex e2bcb13ef4..948fad59df 100644--- a/resources/views/locations/view.blade.php+++ b/resources/views/locations/view.blade.php@@ -95,7 +95,7 @@/><x-tabs.files-tab count="{{ $location->uploads->count() }}"/>-+<x-tabs.nav-itemname="history"icon="fa-solid fa-clock-rotate-left fa-fw"@@ -193,9 +193,9 @@<x-slot:table_header>{{ trans('general.files') }}</x-slot:table_header>- <x-slot:content>- <x-table.files object_type="locations" :object="$location" />- </x-slot:content>++ <x-table.files object_type="locations" :object="$location"/>+</x-tabs.pane><!-- end files tab pane -->@@ -204,14 +204,14 @@<x-slot:table_header>{{ trans('general.history') }}</x-slot:table_header>- <x-slot:content>- <x-table- name="locationHistory"- api_url="{{ route('api.activity.index', ['item_id' => $location->id, 'item_type' => 'location']) }}"- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"- export_filename="export-locations-history-{{ str_slug($location->name) }}-{{ date('Y-m-d') }}"- />- </x-slot:content>++ <x-table+ name="locationHistory"+ api_url="{{ route('api.activity.index', ['item_id' => $location->id, 'item_type' => 'location']) }}"+ :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"+ export_filename="export-locations-history-{{ str_slug($location->name) }}-{{ date('Y-m-d') }}"+ />+</x-tabs.pane><!-- end history tab pane -->diff --git a/resources/views/maintenances/view.blade.php b/resources/views/maintenances/view.blade.phpindex df6648f252..63db22e860 100644--- a/resources/views/maintenances/view.blade.php+++ b/resources/views/maintenances/view.blade.php@@ -178,9 +178,9 @@ use Carbon\Carbon;<x-slot:table_header>{{ trans('general.files') }}</x-slot:table_header>- <x-slot:content>- <x-table.files object_type="maintenances" :object="$maintenance" />- </x-slot:content>++ <x-table.files object_type="maintenances" :object="$maintenance"/>+</x-tabs.pane></x-slot:tabpanes>diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.phpindex 0145e86d74..62f3e393c0 100644--- a/resources/views/statuslabels/view.blade.php+++ b/resources/views/statuslabels/view.blade.php@@ -13,28 +13,8 @@@section('content')<x-container columns="2"><x-page-column class="col-md-9 main-panel">- <x-box>- @include('partials.asset-bulk-actions')-- <table- data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"- data-cookie-id-table="assetsListingTable"- data-id-table="assetsListingTable"- data-side-pagination="server"- data-sort-order="asc"- data-toolbar="#assetsBulkEditToolbar"- data-bulk-button-id="#bulkAssetEditButton"- data-bulk-form-id="#assetsBulkForm"- id="assetsListingTable"- data-show-columns-search="true"- data-buttons="assetButtons"- class="table table-striped snipe-table"- data-url="{{route('api.assets.index', ['status_id' => $statuslabel->id]) }}"- data-export-options='{- "fileName": "export-assets-{{ str_slug($statuslabel->name) }}-assets-{{ date('Y-m-d') }}",- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]- }'>- </table>+ <x-box name="assets">+ <x-table.assets name="assets" :table_header="trans('general.assets')" :route="route('api.assets.index', ['status_id' => $statuslabel->id])"/></x-box></x-page-column><x-page-column class="col-md-3">@@ -46,7 +26,6 @@<x-button.delete :item="$statuslabel" /></x-slot:buttons>-</x-box.info-panel></x-box></x-page-column>diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.phpindex 868b2ea720..3d4d630a89 100755--- a/resources/views/suppliers/view.blade.php+++ b/resources/views/suppliers/view.blade.php@@ -39,7 +39,7 @@<x-slot:tabpanes><!-- start assets tab pane -->- <x-tabs.pane name="assets" count="{{ $supplier->assets()->AssetsForShow()->count() }}">+ <x-tabs.pane name="assets"><x-table.assets name="assets" :route="route('api.assets.index', ['supplier_id' => $supplier->id, 'itemtype' => 'assets'])"/></x-tabs.pane><!-- end assets tab pane -->@@ -93,9 +93,9 @@<x-slot:table_header>{{ trans('general.files') }}</x-slot:table_header>- <x-slot:content>- <x-table.files object_type="suppliers" :object="$supplier" />- </x-slot:content>++ <x-table.files object_type="suppliers" :object="$supplier"/>+</x-tabs.pane><!-- end files tab pane -->