Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

Commit

Permalink
Merge pull request #176 from luzhongyang/feature/issue/319
Browse files Browse the repository at this point in the history
Feature/issue/319
  • Loading branch information
QuantYork committed Nov 5, 2021
2 parents e228792 + 1b5da58 commit cfc326f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions iast/views/project_report_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from dongtai.endpoint import R
from dongtai.endpoint import UserEndPoint
from dongtai.models.project_report import ProjectReport
from dongtai.models.project import IastProject
from django.utils.translation import gettext_lazy as _
from rest_framework import serializers
from iast.utils import extend_schema_with_envcheck
Expand All @@ -13,6 +14,7 @@ class _ProjectReportSearchQuerysSerializer(serializers.Serializer):
page_size = serializers.IntegerField(default=20,
help_text=_('Number per page'))
page = serializers.IntegerField(default=1, help_text=_('Page index'))
pid = serializers.IntegerField(default=1, help_text=_('Project id'))


class _ProjectReportListDataSerializer(serializers.ModelSerializer):
Expand All @@ -35,8 +37,10 @@ class ProjectReportList(UserEndPoint):
)
def get(self, request):
page = request.query_params.get('page', 1)
pid = request.query_params.get('pid', 0)
page_size = request.query_params.get('page_size', 20)
ser = _ProjectReportSearchQuerysSerializer(data=request.data)
project = IastProject.objects.filter(pk=pid, user=request.user).first()
try:
if ser.is_valid(True):
page = ser.validated_data['page']
Expand All @@ -45,6 +49,7 @@ def get(self, request):
return R.failure(data=e.detail)
queryset = ProjectReport.objects.filter(
user=request.user,
project=project
).order_by('-create_time')

page_summary, page_data = self.get_paginator(queryset, page, page_size)
Expand Down
2 changes: 1 addition & 1 deletion iast/views/project_report_sync_add.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def post(self, request):
return R.failure(status=202, msg=_('Report type error'))
ProjectReport.objects.create(
user=request.user, project=project, vul_id=vid,
status=1, type=type, create_time=timestamp, language=get_language()
status=0, type=type, create_time=timestamp, language=get_language()
)

return R.success(msg=_('Created success'))

0 comments on commit cfc326f

Please sign in to comment.