diff --git a/resources/views/hardware/bulk-delete.blade.php b/resources/views/hardware/bulk-delete.blade.php index 85185bdc09..c657877744 100644 --- a/resources/views/hardware/bulk-delete.blade.php +++ b/resources/views/hardware/bulk-delete.blade.php @@ -2,31 +2,30 @@ {{-- Page title --}} @section('title') -{{ trans('admin/hardware/form.bulk_delete') }} +{{ trans('general.bulk_delete') }} @parent @stop -@section('header_right') - - {{ trans('general.back') }} -@stop {{-- Page content --}} @section('content')
-
+

{{ trans('admin/hardware/form.bulk_delete_help') }}

-
+ {{csrf_field()}}
-
-

{{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }}

-
- - + +
+ + {{ trans('admin/hardware/form.bulk_delete_warn', ['asset_count' => count($assets)]) }} +
+ +
+ @@ -34,7 +33,7 @@ - + @foreach ($assets as $asset) @@ -60,7 +59,7 @@
{{ trans('admin/hardware/table.id') }}{{ trans('admin/hardware/table.location')}} {{ trans('admin/hardware/table.assigned_to') }}
- - @foreach ($models as $model) +
+ @foreach ($models as $model) - assets_count > 0 ) ? ' class="warning"' : ' class="success"') !!}> - + + - - + @endforeach
- - {{ $model->display_name }} +
+ + {{ $model->display_name }} - @if ($model->model_number) - ({{ $model->model_number }}) - @endif + @if ($model->model_number) + ({{ $model->model_number }}) + @endif + {{ $model->assets_count }} assets {{ $model->assets_count }} assets -
@@ -100,15 +94,9 @@
- - - {{ trans('admin/hardware/general.require_serial_help') }} - + + {{ trans('admin/hardware/general.require_serial_help') }} +
@@ -142,7 +130,7 @@
diff --git a/resources/views/partials/asset-bulk-actions.blade.php b/resources/views/partials/asset-bulk-actions.blade.php index e0ae15258e..57cc37d29c 100644 --- a/resources/views/partials/asset-bulk-actions.blade.php +++ b/resources/views/partials/asset-bulk-actions.blade.php @@ -1,7 +1,7 @@
name('hardware/bulkedit'); + )->name('hardware.bulkedit.show') + ->breadcrumbs(fn (Trail $trail) => + $trail->parent('hardware.index') + ->push(trans('general.bulk_delete'), route('hardware.index'))); Route::post( 'bulkdelete', [BulkAssetsController::class, 'destroy'] - )->name('hardware/bulkdelete'); + )->name('hardware.bulkdelete.store'); Route::post( 'bulkrestore', diff --git a/routes/web/models.php b/routes/web/models.php index f8a962fb5e..1b70713bff 100644 --- a/routes/web/models.php +++ b/routes/web/models.php @@ -59,7 +59,10 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () { BulkAssetModelsController::class, 'edit' ] - )->name('models.bulkedit.index'); + )->name('models.bulkedit.index') + ->breadcrumbs(fn (Trail $trail) => + $trail->parent('models.index') + ->push(trans('general.bulk_edit'), route('models.index'))); Route::post( 'bulksave', diff --git a/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php b/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php index 738f170dbd..59906cf4aa 100644 --- a/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php +++ b/tests/Feature/Assets/Ui/BulkDeleteAssetsTest.php @@ -76,7 +76,7 @@ class BulkDeleteAssetsTest extends TestCase $id_array = $assets->pluck('id')->toArray(); $response = $this->actingAs($user) - ->from(route('hardware/bulkedit')) + ->from(route('hardware.bulkdelete.store')) ->post('/hardware/bulkdelete', [ 'ids' => $id_array, 'bulk_actions' => 'delete', @@ -109,7 +109,7 @@ class BulkDeleteAssetsTest extends TestCase $this->assertTrue($test_ran, "Test never actually ran!"); $response = $this->actingAs($user) - ->from(route('hardware/bulkedit')) + ->from(route('hardware.bulkdelete.store')) ->post(route('hardware/bulkrestore'), [ 'ids' => [$asset->id], ])->assertStatus(302); @@ -132,7 +132,7 @@ class BulkDeleteAssetsTest extends TestCase $asset = Asset::factory()->create(); $this->actingAs($user) - ->from(route('hardware/bulkedit')) + ->from(route('hardware.bulkdelete.store')) ->post('/hardware/bulkdelete', [ 'ids' => [$asset->id], 'bulk_actions' => 'delete', @@ -159,7 +159,7 @@ class BulkDeleteAssetsTest extends TestCase $asset = Asset::factory()->deleted()->create(); $this->actingAs($user) - ->from(route('hardware/bulkedit')) + ->from(route('hardware.bulkdelete.store')) ->post(route('hardware/bulkrestore'), [ 'ids' => [$asset->id], 'bulk_actions' => 'restore', @@ -186,7 +186,7 @@ class BulkDeleteAssetsTest extends TestCase ]); $response = $this->actingAs($user) - ->from(route('hardware/bulkedit')) + ->from(route('hardware.bulkdelete.store')) ->post('/hardware/bulkdelete', [ 'ids' => [$asset->id], 'bulk_actions' => 'delete',