Skip to content

Commit 9314f9d

Browse files
authored
refactoring to filters and finding_group view
1 parent a86218e commit 9314f9d

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

dojo/filters.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,15 +2017,14 @@ def set_related_object_fields(self, *args: list, **kwargs: dict):
20172017

20182018

20192019
class FindingGroupsFilter(FilterSet):
2020-
name = CharFilter(method="filter_name", label="Name")
2020+
name = CharFilter(lookup_expr="icontains", label="Name")
20212021
severity = ChoiceFilter(
20222022
choices=[
20232023
("Low", "Low"),
20242024
("Medium", "Medium"),
20252025
("High", "High"),
20262026
("Critical", "Critical"),
20272027
],
2028-
method="filter_min_severity",
20292028
label="Min Severity",
20302029
)
20312030
engagement = ModelMultipleChoiceFilter(queryset=Engagement.objects.none(), label="Engagement")

dojo/finding_group/views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
)
2424
from dojo.finding.queries import prefetch_for_findings
2525
from dojo.forms import DeleteFindingGroupForm, EditFindingGroupForm, FindingBulkUpdateForm
26-
from dojo.models import Dojo_Group, Engagement, Finding, Finding_Group, GITHUB_PKey, Global_Role, Product
26+
from dojo.models import Engagement, Finding, Finding_Group, GITHUB_PKey, Global_Role, Product
27+
from dojo.product.queries import get_authorized_products
2728
from dojo.utils import Product_Tab, add_breadcrumb, get_page_items, get_setting, get_system_setting, get_words_for_field
2829

2930
logger = logging.getLogger(__name__)
@@ -290,8 +291,7 @@ def paginate_queryset(self, queryset: QuerySet[Finding_Group], request: HttpRequ
290291

291292
def get(self, request: HttpRequest) -> HttpResponse:
292293
global_role = Global_Role.objects.filter(user=request.user).first()
293-
user_groups = Dojo_Group.objects.filter(users=request.user)
294-
products = Product.objects.filter(Q(members=request.user) | Q(authorization_groups__in=user_groups)).distinct()
294+
products = get_authorized_products(Permissions.Product_View)
295295
if request.user.is_superuser or (global_role and global_role.role):
296296
finding_groups = self.get_finding_groups(request)
297297
elif products.exists():

0 commit comments

Comments
 (0)