ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16682 from akemidx/bug/sc-28860

Browse Source 
FIXED: Location Being Overwritten By Default Location
This commit is contained in:
snipe
2025-04-14 09:17:52 +01:00
committed by GitHub
parent 0d6a83197a cd10cd34f4
commit c7e89ff879
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Assets/AssetsController.php
View File

@@ -351,11 +351,6 @@ class AssetsController extends Controller
event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update with '.$status->getStatuslabelType().' status', date('Y-m-d H:i:s'), $originalValues));
}
if ($asset->assigned_to == '') {
$asset->location_id = $request->input('rtd_location_id', null);
}
if ($request->filled('image_delete')) {
try {
unlink(public_path().'/uploads/assets/'.$asset->image);

23
tests/Feature/Assets/Ui/EditAssetTest.php
View File

@@ -102,4 +102,27 @@ class EditAssetTest extends TestCase
}, 1);
}
public function testCurrentLocationIsNotUpdatedOnEdit()
{
$defaultLocation = Location::factory()->create();
$currentLocation = Location::factory()->create();
$asset = Asset::factory()->create([
'location_id' => $currentLocation->id,
'rtd_location_id' => $defaultLocation->id
]);
$this->actingAs(User::factory()->viewAssets()->editAssets()->create())
->put(route('hardware.update', $asset), [
'redirect_option' => 'item',
'name' => 'New name',
'asset_tags' => 'New Asset Tag',
'status_id' => $asset->status_id,
'model_id' => $asset->model_id,
]);
$asset->refresh();
$this->assertEquals('New name', $asset->name);
$this->assertEquals($currentLocation->id, $asset->location_id);
}
}