Fixes #13341: Clean up correct seats on license delete #13342
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
When you have two licenses:
When you now delete License B, and License A has a seat with the id of License A, then the fields assigned_to and asset_id will be set to NULL.
This happens because in snipe-it/app/Http/Controllers/Licenses/LicensesController.php:210 the query incorrectly checks for id instead of license_id.
Additionally, this does not show up in the activity log.
Before this change, we checked for the
id
collumn in thelicense_seats
table, insteasd of usinglicense_id
for this.This way, we ensure that we only alter seats belonging to the correct license.
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context, providing screenshots where practical. List any dependencies that are required for this change.
Fixes #13341
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Checklist: