A free open source IT asset/license management system
Converted assets bulk action menu
snipee0a3dd2e979c
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.phpindex f14ec912bd..a906e26ada 100644--- a/app/Http/Transformers/AssetsTransformer.php+++ b/app/Http/Transformers/AssetsTransformer.php@@ -179,6 +179,16 @@ class AssetsTransformer'update' => ($asset->deleted_at == '' && Gate::allows('update', Asset::class)) ? true : false,'audit' => Gate::allows('audit', Asset::class) ? true : false,'delete' => ($asset->deleted_at == '' && $asset->assigned_to == '' && Gate::allows('delete', Asset::class) && ($asset->deleted_at == '')) ? true : false,+ 'bulk_selectable' => [+ 'edit' => ($asset->deleted_at == '' && Gate::allows('update', Asset::class)),+ 'maintenance' => ($asset->deleted_at == '' && Gate::allows('update', Asset::class)),+ 'checkout' => ($asset->deleted_at == '' && ! $asset->assigned_to && Gate::allows('checkout', Asset::class)),+ 'checkin' => ($asset->deleted_at == '' && $asset->assigned_to && Gate::allows('checkin', Asset::class)),+ 'audit' => ($asset->deleted_at == '' && Gate::allows('audit', Asset::class)),+ 'delete' => ($asset->deleted_at == '' && ! $asset->assigned_to && Gate::allows('delete', Asset::class)),+ 'labels' => $asset->deleted_at == '',+ 'restore' => ($asset->deleted_at != '' && Gate::allows('create', Asset::class)),+ ],];if (request('components') == 'true') {diff --git a/resources/views/blade/table/assets.blade.php b/resources/views/blade/table/assets.blade.phpindex cb72ed224a..09f08f60d1 100644--- a/resources/views/blade/table/assets.blade.php+++ b/resources/views/blade/table/assets.blade.php@@ -18,7 +18,7 @@</x-slot:table_header><x-slot:bulkactions>- <x-table.bulk-assets :status_type="$status_type"/>+ <x-table.bulk-assets /></x-slot:bulkactions><x-tablediff --git a/resources/views/blade/table/bulk-assets.blade.php b/resources/views/blade/table/bulk-assets.blade.phpindex c7ef295062..27056cb343 100644--- a/resources/views/blade/table/bulk-assets.blade.php+++ b/resources/views/blade/table/bulk-assets.blade.php@@ -1,61 +1,19 @@-@props(['status_type' => null])@aware(['name'])- <form- method="POST"- action="{{ route('hardware.bulkedit.show') }}"- accept-charset="UTF-8"- class="form-inline"- id="{{ Illuminate\Support\Str::camel($name) }}Form"- >- @csrf-- <div style="width:100% !important;" class="hidden-print">- {{-- The sort and order will only be used if the cookie is actually empty (like on first-use) --}}- <input name="sort" type="hidden" value="assets.id">- <input name="order" type="hidden" value="asc">- <label>- <span class="sr-only">- {{ trans('button.bulk_actions') }}- </span>-- <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="width: 350px !important;">- @if ($status_type == 'Deleted')- @can('delete', \App\Models\Asset::class)- <option value="restore">{{trans('button.restore')}}</option>- @endcan- @else-- @can('update', \App\Models\Asset::class)- <option value="edit">{{ trans('general.bulk_edit') }}</option>- <option value="maintenance">{{ trans('button.add_maintenance') }}</option>- @endcan-- @if($status_type != 'Deployed' && $status_type != 'Archived')- @can('checkout', \App\Models\Asset::class)- <option value="checkout">{{ trans('general.bulk_checkout') }}</option>- @endcan- @endif-- @if(!$status_type || $status_type == 'Deployed')- @can('checkin', \App\Models\Asset::class)- <option value="checkin">{{ trans('admin/hardware/general.bulk_checkin') }}</option>- @endcan- @endif-- @can('audit', \App\Models\Asset::class)- <option value="audit">{{ trans('admin/hardware/general.bulk_audit') }}</option>- @endcan-- @can('delete', \App\Models\Asset::class)- <option value="delete">{{ trans('general.bulk_delete') }}</option>- @endcan-- <option value="labels">{{ trans_choice('button.generate_labels', 2) }}</option>- @endif- </select>-- <button class="btn btn-theme" id="{{ Illuminate\Support\Str::camel($name) }}Button" disabled>{{ trans('button.go') }}</button>- </label>- </div>- </form>+@canany(['update', 'checkout', 'checkin', 'audit', 'delete', 'create'], \App\Models\Asset::class)+ <x-table.bulk-actions+ :name="$name"+ :action_route="route('hardware.bulkedit.show')"+ model_name="asset"+ :actions="[+ 'edit' => ['label' => trans('general.bulk_edit')],+ 'maintenance' => ['label' => trans('button.add_maintenance')],+ 'checkout' => ['label' => trans('general.bulk_checkout')],+ 'checkin' => ['label' => trans('admin/hardware/general.bulk_checkin')],+ 'audit' => ['label' => trans('admin/hardware/general.bulk_audit')],+ 'delete' => ['label' => trans('general.bulk_delete')],+ 'labels' => ['label' => trans_choice('button.generate_labels', 2)],+ 'restore' => ['label' => trans('button.restore')],+ ]"+ />+@endcanany