Merge branch '689-invitations-person-invitation-throws-unexpected-error' into 'master'

Resolve "Invitations: Person invitation throws unexpected error"

Closes #689

See merge request !1019

CHANGELOG.rst

@@ -31,6 +31,7 @@ Fixed
 * Sometimes the PDF files were not generated correctly
   and images were displayed only partially.
 * Error message in permission form was misleading.
+* Personal invites did not work
 * Invite Person view threw an error when personal invites existed
 
 Removed

aleksis/core/forms.py

@@ -639,8 +639,12 @@ class AccountRegisterForm(SignupForm, ExtensibleForm):
         for field in Person._meta.get_fields():
             if field.name in self.cleaned_data:
                 data[field.name] = self.cleaned_data[field.name]
-        if not Person.objects.filter(email=data["email"]):
-            _person, created = Person.objects.update_or_create(user=user, **data)
+        person_qs = Person.objects.filter(email=data["email"])
+        if not person_qs.exists():
+            if get_site_preferences()["account__auto_create_person"]:
+                Person.objects.create(user=user, **data)
+        else:
+            person_qs.update(user=user, **data)
         self.custom_signup(request, user)
         setup_user_email(request, user, [])
         return user