PapaTutuWawa/etesync-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Views: fix issue with iterators sometimes returning the wrong type.

Browse Source
This commit is contained in:
Tom Hacohen 2020-07-25 09:30:40 +03:00
parent 9c129e5731
commit 04231ebfe5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django_etebase/views.py
View File

@ -306,11 +306,11 @@ class CollectionItemViewSet(BaseViewSet):
serializer = CollectionItemRevisionSerializer(result, context=self.get_serializer_context(), many=True) serializer = CollectionItemRevisionSerializer(result, context=self.get_serializer_context(), many=True)
last_item = len(result) > 0 and serializer.data[-1] iterator = serializer.data[-1]['uid'] if len(result) > 0 else None
ret = { ret = {
'data': serializer.data, 'data': serializer.data,
'iterator': last_item and last_item['uid'], 'iterator': iterator,
'done': done, 'done': done,
} }
return Response(ret) return Response(ret)
@ -337,7 +337,7 @@ class CollectionItemViewSet(BaseViewSet):
queryset = queryset.filter(uid__in=uids).exclude(revisions__in=revs) queryset = queryset.filter(uid__in=uids).exclude(revisions__in=revs)
new_stoken = self.get_queryset_stoken(queryset) new_stoken = self.get_queryset_stoken(queryset)
stoken = stoken_rev and stoken_rev.uid stoken = getattr(stoken_rev, 'uid', None) if stoken_rev is not None else None
new_stoken = new_stoken or stoken new_stoken = new_stoken or stoken
serializer = self.get_serializer(queryset, many=True) serializer = self.get_serializer(queryset, many=True)
@ -519,11 +519,11 @@ class InvitationBaseViewSet(BaseViewSet):
serializer = self.get_serializer(result, many=True) serializer = self.get_serializer(result, many=True)
last_item = len(result) > 0 and serializer.data[-1] iterator = serializer.data[-1]['uid'] if len(result) > 0 else None
ret = { ret = {
'data': serializer.data, 'data': serializer.data,
'iterator': last_item and last_item['uid'], 'iterator': iterator,
'done': done, 'done': done,
} }