Merge branch 'invitation-for-person-without-email-not-marked-accepted' into 'master'

Mark code-entered invitation accepted after signup

See merge request !1119

aleksis/core/forms.py

@@ -664,6 +664,16 @@ class AccountRegisterForm(SignupForm, ExtensibleForm):
                 setattr(person, field, value)
             person.user = user
             person.save()
+        invitation_code = request.session.get("invitation_code")
+        if invitation_code:
+            from invitations.views import accept_invitation  # noqa
+
+            try:
+                invitation = PersonInvitation.objects.get(key=invitation_code)
+            except PersonInvitation.DoesNotExist:
+                raise SuspiciousOperation()
+
+            accept_invitation(invitation, request, user)
         self.custom_signup(request, user)
         setup_user_email(request, user, [])
         return user