Fixed #8926, #8252 - introduce circular reference check for location parent_id - rebased from #8253 #8927
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
snipe
reviewed
Dec 19, 2020
| @@ -28,7 +28,7 @@ class Location extends SnipeModel | |||
| 'address2' => 'max:80|nullable', | |||
| 'zip' => 'min:3|max:10|nullable', | |||
| 'manager_id' => 'exists:users,id|nullable', | |||
| 'parent_id' => 'nullable|exists:locations,id|different:id', | |||
| 'parent_id' => 'non_circular:locations,id' | |||
There was a problem hiding this comment.
Can you confirm that this will work with nulled parent_ids? Laravel changed the way their validator worked a while back where you have to specify nullable if it is nullable.
There was a problem hiding this comment.
(Other than that, this looks great to me :) )
snipe
approved these changes
Dec 19, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is all @travismiller 's great work on #8253 , just rebased onto develop.
He introduced a circular-reference check for Location, via the
parent_idThis subsumes the old logic we had which was just to check if something was its own parent or not.
As a side-effect, we no longer need to explicitly set the Location's
idtonullanymore - which should fix #8926