...
|
...
|
@@ -62,8 +62,8 @@ class ProjectDetail(RetrieveAPIView): |
|
|
res = i.result_auditor.filter(project=obj).values('is_accept', 'memo').first()
|
|
|
obj.result.append({
|
|
|
"auditor": i.user.username,
|
|
|
"is_accept": res['is_accept'],
|
|
|
"memo": res['memo'],
|
|
|
"is_accept": res['is_accept'] if res else None,
|
|
|
"memo": res['memo'] if res else '',
|
|
|
})
|
|
|
return response(ProjectSerializer(obj).data)
|
|
|
|
...
|
...
|
@@ -149,5 +149,11 @@ class CheckAuth(APIView): |
|
|
|
|
|
@staticmethod
|
|
|
def get(request, *args, **kwargs):
|
|
|
project_auditor = Project.objects.filter(pk=kwargs['pk'], auditor__user_id=request.user.id)
|
|
|
return response(True) if project_auditor else response(False) |
|
|
project_auditor = Project.objects.filter(
|
|
|
pk=kwargs['pk'],
|
|
|
auditor__user_id=request.user.id)
|
|
|
auditor_res = Result.objects.filter(auditor__user_id=request.user.id, project_id__exact=kwargs['pk'])
|
|
|
if not project_auditor:
|
|
|
return response(True)
|
|
|
else:
|
|
|
return response(False) if auditor_res else response(True) |
...
|
...
|
|