A free open source IT asset/license management system
Use plurals on tablenames
snipe0d2974ca7acf
diff --git a/resources/views/blade/table/bulk-assets.blade.php b/resources/views/blade/table/bulk-assets.blade.phpindex 27056cb343..b65b88591c 100644--- a/resources/views/blade/table/bulk-assets.blade.php+++ b/resources/views/blade/table/bulk-assets.blade.php@@ -4,7 +4,7 @@<x-table.bulk-actions:name="$name":action_route="route('hardware.bulkedit.show')"- model_name="asset"+ model_name="assets":actions="['edit' => ['label' => trans('general.bulk_edit')],'maintenance' => ['label' => trans('button.add_maintenance')],diff --git a/resources/views/blade/table/bulk-models.blade.php b/resources/views/blade/table/bulk-models.blade.phpindex 6493ae1ecd..c937f6b22e 100644--- a/resources/views/blade/table/bulk-models.blade.php+++ b/resources/views/blade/table/bulk-models.blade.php@@ -5,7 +5,7 @@<x-table.bulk-actions:name="$name":action_route="route('models.bulkedit.index')"- model_name="assetmodel"+ model_name="models":actions="['edit' => ['label' => trans('general.bulk_edit')],'delete' => ['label' => trans('general.bulk_delete')],diff --git a/resources/views/blade/table/bulk-users.blade.php b/resources/views/blade/table/bulk-users.blade.phpindex 8001248520..bb03510236 100644--- a/resources/views/blade/table/bulk-users.blade.php+++ b/resources/views/blade/table/bulk-users.blade.php@@ -1,38 +1,17 @@@aware(['name'])-<form- method="POST"- action="{{ route('users/bulkedit') }}"- 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="users.id">- <input name="order" type="hidden" value="asc">- <label for="bulk_actions">- <span class="sr-only">- {{ trans('button.bulk_actions') }}- </span>- </label>- <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="width: 350px !important;">- @can('update', \App\Models\User::class)- <option value="edit">{{ trans('general.bulk_edit') }}</option>- <option value="send_assigned">{{ trans('admin/users/general.email_assigned') }}</option>- @endcan-- @can('delete', \App\Models\User::class)- <option value="delete">{!! trans('general.bulk_checkin_delete') !!}</option>- <option value="merge">{!! trans('general.merge_users') !!}</option>- @endcan-- <option value="bulkpasswordreset">{{ trans('button.send_password_link') }}</option>- <option value="print">{{ trans('admin/users/general.print_assigned') }}</option>- </select>-- <button class="btn btn-theme" id="{{ Illuminate\Support\Str::camel($name) }}Button" disabled>{{ trans('button.go') }}</button>- </div>-</form>+@can('view', \App\Models\User::class)+ <x-table.bulk-actions+ :name="$name"+ :action_route="route('users/bulkedit')"+ model_name="users"+ :actions="[+ 'edit' => ['label' => trans('general.bulk_edit')],+ 'send_assigned' => ['label' => trans('admin/users/general.email_assigned')],+ 'delete' => ['label' => trans('general.bulk_checkin_delete')],+ 'merge' => ['label' => trans('general.merge_users')],+ 'bulkpasswordreset' => ['label' => trans('button.send_password_link')],+ 'print' => ['label' => trans('admin/users/general.print_assigned')],+ ]"+ />+@endcan