From aebf03d90fd41989df8b529594a25f494ff8b28e Mon Sep 17 00:00:00 2001
From: Jonas Braathen <jonas.braathen@usit.uio.no>
Date: Fri, 11 Mar 2022 01:06:50 +0100
Subject: [PATCH] Fix bad merge and failing test
---
gregui/api/serializers/guest.py | 8 ++------
gregui/tests/api/serializers/test_guest.py | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/gregui/api/serializers/guest.py b/gregui/api/serializers/guest.py
index 33607815..c6ceab32 100644
--- a/gregui/api/serializers/guest.py
+++ b/gregui/api/serializers/guest.py
@@ -6,11 +6,6 @@ from rest_framework import serializers
from rest_framework.exceptions import ValidationError
from rest_framework.fields import BooleanField, CharField, SerializerMethodField
-<<<<<<< HEAD
-from greg.models import Consent, ConsentChoice, ConsentType, Identity, Person
-from greg.utils import is_identity_duplicate
-from gregui.api.serializers.IdentityDuplicateError import IdentityDuplicateError
-=======
from greg.models import (
Consent,
@@ -20,9 +15,10 @@ from greg.models import (
Person,
InvitationLink,
)
+from greg.utils import is_identity_duplicate
+from gregui.api.serializers.IdentityDuplicateError import IdentityDuplicateError
from gregui.api.serializers.identity import PartialIdentitySerializer
from gregui.api.serializers.role import ExtendedRoleSerializer
->>>>>>> 5be5116 (Add an invitation status field to the guest serializer for use in the UI.)
from gregui.validation import (
validate_phone_number,
validate_norwegian_national_id_number,
diff --git a/gregui/tests/api/serializers/test_guest.py b/gregui/tests/api/serializers/test_guest.py
index 82176be4..456f7034 100644
--- a/gregui/tests/api/serializers/test_guest.py
+++ b/gregui/tests/api/serializers/test_guest.py
@@ -17,7 +17,7 @@ def test_serialize_guest(invited_person):
"first": "Foo",
"fnr": None,
"invitation_status": "active",
- "last": "Bar",
+ "last": "BaÙ…r",
"mobile": None,
"passport": None,
"pid": "1",
--
GitLab