Do more filtering in new base views #5580
Merged
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
rowanseymour
commented
Oct 24, 2024
| @@ -1112,7 +1112,7 @@ def build_context_menu(self, menu): | |||
| ) | |||
|
|
|||
| def derive_queryset(self, **kwargs): | |||
| return super().derive_queryset(**kwargs).filter(is_active=True, is_system=False) | |||
| return super().derive_queryset(**kwargs).filter(is_proxy=False) | |||
There was a problem hiding this comment.
is_proxy for fields means "created_on" etc which are proxies for Contact model attributes
rowanseymour
commented
Oct 24, 2024
| @@ -684,8 +684,7 @@ def get_context_data(self, **kwargs): | |||
| return context | |||
|
|
|||
| def derive_queryset(self, *args, **kwargs): | |||
| qs = super().derive_queryset(*args, **kwargs) | |||
| return qs.exclude(is_system=True).exclude(is_active=False) | |||
| return super().derive_queryset(*args, **kwargs).exclude(is_system=True) | |||
There was a problem hiding this comment.
is_system for flows means single message campaign flows for now... these might become broadcasts anyways
rowanseymour
commented
Oct 24, 2024
|
|
||
| if not self.request.user.is_authenticated: | ||
| return qs.none() # pragma: no cover |
There was a problem hiding this comment.
this can't happen.. base list views use OrgPermsMixin so you can't be here if org isn't set
rowanseymour
force-pushed
the
base_list_view_filtering
branch
2 times, most recently
from
4bec02f
to
8388fee
Compare
…always filter by is_system=False
rowanseymour
force-pushed
the
base_list_view_filtering
branch
from
8388fee
to
820c009
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #5580 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 550 550
Lines 25671 25674 +3
=========================================
+ Hits 25671 25674 +3 ☔ View full report in Codecov by Sentry. |
norkans7
approved these changes
Oct 24, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
BaseListViewfilter byis_active=TrueBaseUpdateViewfilter byis_active=Trueandis_system=FalseBaseDeleteViewnoop foris_system=True