Skip to content

Commit 13d66ca

Browse files
authored
Merge pull request doccano#918 from doccano/fix/doccano#481
Fix ApproveLabelsAPI not to show other's annotations if it's checked
2 parents 35cc8b3 + 1ac6d51 commit 13d66ca

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

app/api/serializers.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,13 @@ class Meta:
8484
fields = ('id', 'text', 'annotations', 'meta', 'annotation_approver')
8585

8686

87+
class ApproverSerializer(DocumentSerializer):
88+
89+
class Meta:
90+
model = Document
91+
fields = ('id', 'annotation_approver')
92+
93+
8794
class ProjectSerializer(serializers.ModelSerializer):
8895
current_users_role = serializers.SerializerMethodField()
8996

app/api/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from .filters import DocumentFilter
2121
from .models import Project, Label, Document, RoleMapping, Role
2222
from .permissions import IsProjectAdmin, IsAnnotatorAndReadOnly, IsAnnotator, IsAnnotationApproverAndReadOnly, IsOwnAnnotation, IsAnnotationApprover
23-
from .serializers import ProjectSerializer, LabelSerializer, DocumentSerializer, UserSerializer
23+
from .serializers import ProjectSerializer, LabelSerializer, DocumentSerializer, UserSerializer, ApproverSerializer
2424
from .serializers import ProjectPolymorphicSerializer, RoleMappingSerializer, RoleSerializer
2525
from .utils import CSVParser, ExcelParser, JSONParser, PlainTextParser, CoNLLParser, AudioParser, iterable_to_io
2626
from .utils import JSONLRenderer
@@ -133,7 +133,7 @@ def post(self, request, *args, **kwargs):
133133
document = get_object_or_404(Document, pk=self.kwargs['doc_id'])
134134
document.annotations_approved_by = self.request.user if approved else None
135135
document.save()
136-
return Response(DocumentSerializer(document).data)
136+
return Response(ApproverSerializer(document).data)
137137

138138

139139
class LabelList(generics.ListCreateAPIView):

0 commit comments

Comments
 (0)