arno/etesync-server
1
0
Fork 0
mirror of https://github.com/etesync/server synced 2024-11-26 10:48:21 +00:00
Code Issues Releases Wiki Activity

Invitations: gracefully error when trying to invite an already invited user.

Browse Source
This commit is contained in:
Tom Hacohen 2020-09-20 19:33:55 +03:00
parent 374048f013
commit 4dbdb3d7cf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django_etebase/serializers.py
View File

@ -17,7 +17,7 @@ import base64
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from django.core import exceptions as django_exceptions from django.core import exceptions as django_exceptions
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from django.db import transaction from django.db import IntegrityError, transaction
from rest_framework import serializers, status from rest_framework import serializers, status
from . import models from . import models
from .utils import get_user_queryset, create_user from .utils import get_user_queryset, create_user
@ -368,7 +368,10 @@ class CollectionInvitationSerializer(BetterErrorsMixin, serializers.ModelSeriali
member = collection.members.get(user=request.user) member = collection.members.get(user=request.user)
with transaction.atomic(): with transaction.atomic():
return type(self).Meta.model.objects.create(**validated_data, fromMember=member) try:
return type(self).Meta.model.objects.create(**validated_data, fromMember=member)
except IntegrityError:
raise EtebaseValidationError('invitation_exists', 'Invitation already exists')
def update(self, instance, validated_data): def update(self, instance, validated_data):
with transaction.atomic(): with transaction.atomic():