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.
Currently disabling Landlord with
disable()
just affects new types of models and newly created models but not models where the scope has already been added to.This is because
enabled
is checked only when a scope should be added to a model but not when the scope is applied to an actual query.In this PR I moved the enabled-check to the global scope closure so the tenant scope is never applied if it was disabled previously which is the expected behavior in my opinion.
This is also the behavior of Landlord 1.
I also moved the global scope code into a private method to reduce duplication.