Skip to content

A free open source IT asset/license management system

Covert assets table

snipe56313e443609
diff --git a/resources/views/blade/box/index.blade.php b/resources/views/blade/box/index.blade.php
index 1438a1c658..7d474f817b 100644
--- a/resources/views/blade/box/index.blade.php
+++ b/resources/views/blade/box/index.blade.php
@@ -25,7 +25,14 @@
</div>
@endif
- {{ $slot }}
+ @if ((isset($content)) && (!$content->isEmpty()))
+ {{ $content }}
+ @endif
+
+ @if (($slot) && (!$slot->isEmpty()))
+ {{ $slot }}
+ @endif
+
</div>
@if ($route)
diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php
index b50734f325..9e709d8dd4 100755
--- a/resources/views/hardware/index.blade.php
+++ b/resources/views/hardware/index.blade.php
@@ -54,39 +54,12 @@
{{-- Page content --}}
@section('content')
<x-container>
- <x-box>
-
- @include('partials.asset-bulk-actions', ['status' => $requestStatus])
-
- <table
- data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
- data-cookie-id-table="{{ request()->has('status') ? e(request()->input('status')) : '' }}assetsListingTable"
- data-id-table="{{ request()->has('status') ? e(request()->input('status')) : '' }}assetsListingTable"
- data-side-pagination="server"
- data-show-footer="true"
- data-sort-order="asc"
- data-sort-name="name"
- data-fixed-number="2"
- data-fixed-right-number="2"
- data-search-text="{{ session()->get('search') }}"
- data-show-columns-search="true"
- data-toolbar="#assetsBulkEditToolbar"
- data-bulk-button-id="#bulkAssetEditButton"
- data-bulk-form-id="#assetsBulkForm"
- data-buttons="assetButtons"
- id="{{ request()->has('status') ? e(request()->input('status')) : '' }}assetsListingTable"
- class="table table-striped snipe-table"
- data-url="{{ route('api.assets.index',
+ <x-box name="assets">
+ <x-table.assets :route="route('api.assets.index',
array('status' => e($requestStatus),
'order_number'=>e(strval($requestOrderNumber)),
'company_id'=>e($requestCompanyId),
- 'status_id'=>e($requestStatusId))) }}"
- data-export-options='{
- "fileName": "export{{ (Request::has('status')) ? '-'.str_slug($requestStatus) : '' }}-assets-{{ date('Y-m-d') }}",
- "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
- }'>
- </table>
-
+ 'status_id'=>e($requestStatusId)))" />
</x-box>
</x-container>
@stop