A couple of fixes to enable specifying an existing profile on sign up

Author: MaKleSoft

Diff for: api.py

@@ -186,7 +186,7 @@ def sign_up(request):
 
         user = User.objects.create(username=username, password=password, first_name=first_name, last_name=last_name, email=email)
 
-        profile = form.cleaned_data['profile'] or Person.objects.create(user=user)
+        profile = form.cleaned_data['profile'] or Person.objects.create()
         profile.first_name = first_name
         profile.last_name = last_name
         profile.gender = gender
@@ -195,6 +195,7 @@ def sign_up(request):
         profile.city = city
         profile.zip_code = zip_code
         profile.mobile_number = mobile_number
+        profile.user = user
 
         # Build the activation key
         salt = sha.new(str(random())).hexdigest()[:5]

Diff for: forms.py

@@ -15,15 +15,13 @@ class SignUpForm(forms.Form):
     gender = forms.ChoiceField(choices=(('male', _('male')), ('female', _('female'))))
     first_name = forms.CharField(label=_('First Name'), required=True)
     last_name = forms.CharField(label=_('Last Name'), required=True)
+    profile = forms.ModelChoiceField(required=False, queryset=Person.objects.filter(user__isnull=True))
     pass_number = forms.IntegerField(label=_('Pass Number'), required=False)
     address = forms.CharField(label=_('Address'), required=False)
     city = forms.CharField(label=_('City'), required=False)
     zip_code = forms.IntegerField(label=_('Zip Code'), required=False)
     mobile_number = forms.CharField(label=_('Mobile Number'), required=False)
 
-    profile = forms.ModelChoiceField(required=False,
-        queryset=Person.objects.filter(first_name=first_name).filter(last_name=last_name).filter(user__isnull=True))
-
     def clean_username(self):
         data = self.cleaned_data['username']
         try:
@@ -41,14 +39,22 @@ def clean_email(self):
         raise forms.ValidationError(
             _('A user with this email is already registered.'))
 
-    def clean_pass_number(self):
-        data = self.cleaned_data['pass_number']
+    def clean(self):
+        cleaned_data = super(SignUpForm, self).clean()
+        pass_number = cleaned_data['pass_number']
+        profile = cleaned_data['profile'] or {'id': None}
+
+        # check if pass number is unique
         try:
-            Person.objects.get(pass_number=data)
+            Person.objects.exclude(id=profile.id).get(pass_number=pass_number)
         except Person.DoesNotExist:
-            return data
-        raise forms.ValidationError(
-            _('A player with this pass number is already registered.'))
+            return cleaned_data
+
+        msg = _('A user with this pass number does already exist!')
+        self._errors['pass_number'] = self.error_class([msg])
+        del cleaned_data['pass_number']
+
+        return cleaned_data
 
     # def clean(self):
     #     cleaned_data = super(SignUpForm, self).clean()