nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2026-01-30 16:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow for EVE API key claiming if they're already in the DB. - Thanks Dorijan and Nil'kandra

Browse Source
This commit is contained in:
Andrew Williams
2011-10-07 09:13:11 +01:00
parent feb4528c97
commit 57b3a8f654
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/eve_api/forms.py
View File

@@ -51,7 +51,7 @@ class EveAPIForm(forms.ModelForm):
raise forms.ValidationError("You cannot change your API User ID") raise forms.ValidationError("You cannot change your API User ID")
else: else:
try: try:
eaccount = EVEAccount.objects.get(api_user_id=self.cleaned_data['api_user_id']) eaccount = EVEAccount.objects.get(api_user_id=self.cleaned_data['api_user_id'], user__isnull=False)
except EVEAccount.DoesNotExist: except EVEAccount.DoesNotExist:
pass pass
else: else:

4
app/eve_api/tasks/account.py
View File

@@ -161,8 +161,8 @@ def import_apikey_func(api_userid, api_key, user=None, force_cache=False, log=lo
if not 'error' in doc: if not 'error' in doc:
if not account: if not account:
account, created = EVEAccount.objects.get_or_create(pk=api_userid) account, created = EVEAccount.objects.get_or_create(pk=api_userid)
if user: if user and not account.user:
account.user = User.objects.get(id=user) account.user = User.objects.get(id=user)
if not account.api_key == api_key: if not account.api_key == api_key:
account.api_key = api_key account.api_key = api_key
account.api_status = API_STATUS_OK account.api_status = API_STATUS_OK