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

Merge pull request #16675 from Godmartinz/null_location_id_fix

Browse Source 
Adds a check for assigned target not being null when creating an asset
This commit is contained in:
snipe
2025-06-06 08:30:31 +01:00
committed by GitHub
parent 246f1373a8 c385b4a082
commit dd3d264e63
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,14 +188,31 @@ class AssetsController extends Controller
// Validate the asset before saving
if ($asset->isValid() && $asset->save()) {
if (request('assigned_user')) {
$target = User::find(request('assigned_user'));
$target = null;
$location = null;
if ($userId = request('assigned_user')) {
$target = User::find($userId);
if (!$target) {
return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.user'));
}
$location = $target->location_id;
} elseif (request('assigned_asset')) {
$target = Asset::find(request('assigned_asset'));
} elseif ($assetId = request('assigned_asset')) {
$target = Asset::find($assetId);
if (!$target) {
return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.asset'));
}
$location = $target->location_id;
} elseif (request('assigned_location')) {
$target = Location::find(request('assigned_location'));
} elseif ($locationId = request('assigned_location')) {
$target = Location::find($locationId);
if (!$target) {
return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.location'));
}
$location = $target->id;
}

5
resources/lang/en-US/admin/hardware/message.php
View File

@@ -19,6 +19,11 @@ return [
'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
'multi_success_linked' => 'Asset with tag :links was created successfully.|:count assets were created succesfully. :links.',
'partial_failure' => 'An asset was unable to be created. Reason: :failures|:count assets were unable to be created. Reasons: :failures',
'target_not_found' => [
'user' => 'The assigned user could not be found.',
'asset' => 'The assigned asset could not be found.',
'location' => 'The assigned location could not be found.',
],
],
'update' => [