From b64b774bd55b308be8177bb5cf4c8152131436a8 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 24 Jul 2024 17:49:21 +0100 Subject: [PATCH 1/4] Use route model binding on clone, removed unneeded route Signed-off-by: snipe --- routes/web/hardware.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/routes/web/hardware.php b/routes/web/hardware.php index 7833f0fda..ee888aa1d 100644 --- a/routes/web/hardware.php +++ b/routes/web/hardware.php @@ -78,17 +78,14 @@ Route::group( [AssetsController::class, 'getAssetBySerial'] )->where('any', '.*')->name('findbyserial/hardware'); - Route::get('{assetId}/clone', + Route::get('{asset}/clone', [AssetsController::class, 'getClone'] - )->name('clone/hardware'); + )->name('clone/hardware')->withTrashed(); Route::get('{assetId}/label', [AssetsController::class, 'getLabel'] )->name('label/hardware'); - - Route::post('{assetId}/clone', - [AssetsController::class, 'postCreate'] - ); + Route::get('{assetId}/checkout', [AssetCheckoutController::class, 'create'] From 293abbd1d0c7e031de7b93cce0c1894a1a38ffbb Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 24 Jul 2024 17:49:38 +0100 Subject: [PATCH 2/4] Allow cloning of deleted assets Signed-off-by: snipe --- .../Controllers/Assets/AssetsController.php | 24 ++++++-------- resources/views/hardware/view.blade.php | 31 +++++++++---------- 2 files changed, 24 insertions(+), 31 deletions(-) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 475f93e27..8fecff7e1 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -576,26 +576,20 @@ class AssetsController extends Controller * @since [v1.0] * @return \Illuminate\Contracts\View\View */ - public function getClone($assetId = null) + public function getClone(Asset $asset) { - // Check if the asset exists - if (is_null($asset_to_clone = Asset::find($assetId))) { - // Redirect to the asset management page - return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist')); - } - - $this->authorize('create', $asset_to_clone); - - $asset = clone $asset_to_clone; - $asset->id = null; - $asset->asset_tag = ''; - $asset->serial = ''; - $asset->assigned_to = ''; + $this->authorize('create', $asset); + $cloned = clone $asset; + $cloned->id = null; + $cloned->asset_tag = ''; + $cloned->serial = ''; + $cloned->assigned_to = ''; + $cloned->deleted_at = ''; return view('hardware/edit') ->with('statuslabel_list', Helper::statusLabelList()) ->with('statuslabel_types', Helper::statusTypeList()) - ->with('item', $asset); + ->with('item', $cloned); } /** diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 674233f5a..6e2b2175f 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -36,7 +36,7 @@ @endif - +
    @@ -197,16 +197,25 @@ @endif @endif - - @can('update', $asset) - @if ($asset->deleted_at=='') + @if ($asset->deleted_at=='') + @can('update', $asset)
    {{ trans('admin/hardware/general.edit') }}
    - @endif - @endcan + @endcan + + @can('audit', \App\Models\Asset::class) +
    + model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> + + {{ trans('general.audit') }} + + +
    + @endcan + @endif @can('create', $asset)
    @@ -216,16 +225,6 @@
    @endcan - @can('audit', \App\Models\Asset::class) -
    - model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'"' : '') !!}> - - {{ trans('general.audit') }} - - -
    - @endcan - @can('delete', $asset)
    @if ($asset->deleted_at=='') From 425bfa431851ec7fabdff70c922d32c40d0f9579 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 24 Jul 2024 18:06:21 +0100 Subject: [PATCH 3/4] Added test Signed-off-by: snipe --- tests/Feature/Assets/Ui/CloneAssetTest.php | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tests/Feature/Assets/Ui/CloneAssetTest.php diff --git a/tests/Feature/Assets/Ui/CloneAssetTest.php b/tests/Feature/Assets/Ui/CloneAssetTest.php new file mode 100644 index 000000000..ad06561d1 --- /dev/null +++ b/tests/Feature/Assets/Ui/CloneAssetTest.php @@ -0,0 +1,37 @@ +create(); + $this->actingAs(User::factory()->create()) + ->get(route('clone/hardware', $asset)) + ->assertForbidden(); + } + + public function testPageCanBeAccessed(): void + { + $asset = Asset::factory()->create(); + $response = $this->actingAs(User::factory()->createAssets()->create()) + ->get(route('clone/hardware', $asset)); + $response->assertStatus(200); + } + + public function testAssetCanBeCloned() + { + $asset_to_clone = Asset::factory()->create(['name'=>'Asset to clone']); + $this->actingAs(User::factory()->createAssets()->create()) + ->get(route('clone/hardware', $asset_to_clone)) + ->assertOk() + ->assertSee([ + 'Asset to clone' + ], false);; + } +} From d1c39a737f74e6344f30f8b7eb335c21dc8288f1 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 24 Jul 2024 18:09:32 +0100 Subject: [PATCH 4/4] Fixed double semicolon Signed-off-by: snipe --- tests/Feature/Assets/Ui/CloneAssetTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Feature/Assets/Ui/CloneAssetTest.php b/tests/Feature/Assets/Ui/CloneAssetTest.php index ad06561d1..18e1ccc5e 100644 --- a/tests/Feature/Assets/Ui/CloneAssetTest.php +++ b/tests/Feature/Assets/Ui/CloneAssetTest.php @@ -32,6 +32,6 @@ class CloneAssetTest extends TestCase ->assertOk() ->assertSee([ 'Asset to clone' - ], false);; + ], false); } }