From e201f0153e32a1e09becb1555aea64834909c6ca Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 8 Jul 2011 10:39:23 +0100 Subject: [PATCH] Fixed previous instance checking, check for PK as well as instance --- app/eve_api/forms.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/eve_api/forms.py b/app/eve_api/forms.py index 4180bfa..3495f8f 100644 --- a/app/eve_api/forms.py +++ b/app/eve_api/forms.py @@ -40,15 +40,15 @@ class EveAPIForm(forms.ModelForm): except ValueError: raise forms.ValidationError("Please provide a valid user ID.") - if not getattr(self, 'instance', None): + if self.instance and self.instance.pk: + if not int(self.cleaned_data['api_user_id']) == self.instance.api_user_id: + raise forms.ValidationError("You cannot change your API User ID") + else: try: eaccount = EVEAccount.objects.get(api_user_id=self.cleaned_data['api_user_id']) except EVEAccount.DoesNotExist: pass else: raise forms.ValidationError("This API User ID is already registered") - else: - if not int(self.cleaned_data['api_user_id']) == self.instance.api_user_id: - raise forms.ValidationError("You cannot change your API User ID") return self.cleaned_data['api_user_id']