Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pref: improve projects pref #1695

Merged
merged 2 commits into from
Aug 3, 2023
Merged

pref: improve projects pref #1695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a298f4
pref: improve projects pref
st1020 Aug 3, 2023
dc5d598
pref: improve projects pref
st1020 Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion dongtai_web/serializers/project.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,19 @@ def get_agent_count(queryset: "QuerySet | _SupportsPagination") -> defaultdict:
return agent_count_dict


class BaseProjectSerializer(serializers.ModelSerializer):
class Meta:
model = IastProject
fields = [
"id",
"name",
"mode",
"latest_time",
"vul_validation",
"status",
]


class ProjectSerializer(serializers.ModelSerializer):
def __init__(self, *args, **kwargs):
if "exclude_vul_status" in kwargs:
Expand Down Expand Up @@ -133,5 +146,5 @@ def get_project_group_name(self, obj: IastProject) -> list:
if "project_group_name" in self.context:
res = self.context["project_group_name"][obj.id]
else:
res = obj.iastprojectgroup_set.values_list("name", flat=True)
res = (x.name for x in obj.iastprojectgroup_set.all())
return list(res)
2 changes: 1 addition & 1 deletion dongtai_web/views/projects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def get(self, request: Request):
queryset = queryset.filter(status=status)
if project_group_name is not None:
queryset = queryset.filter(iastprojectgroup__name__icontains=project_group_name)
queryset = queryset.select_related("user")
queryset = queryset.select_related("user").prefetch_related("iastprojectgroup_set")
page_summary, page_data = self.get_paginator(queryset, page, page_size)
vul_levels_dict = get_vul_levels_dict(page_data, exclude_vul_status=exclude_vul_status)
project_language_dict = get_project_language(page_data)
Expand Down
Loading