From a14ac273c17910fc4a76d395fbb61b1c1e1d4196 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Thu, 11 Aug 2011 22:23:00 +0100 Subject: [PATCH] Don't presave invalid account details --- app/eve_api/tasks/account.py | 2 +- app/eve_api/views.py | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/eve_api/tasks/account.py b/app/eve_api/tasks/account.py index 7eb412a..f6c73fd 100644 --- a/app/eve_api/tasks/account.py +++ b/app/eve_api/tasks/account.py @@ -103,7 +103,7 @@ def import_apikey_func(api_userid, api_key, user=None, force_cache=False, log=lo # Create or retrieve the account last to make sure everything # before here is good to go. account, created = EVEAccount.objects.get_or_create(api_user_id=api_userid) - if not created and not account.api_key == api_key: + if not account.api_key == api_key: account.api_key = api_key account.api_keytype = API_KEYTYPE_UNKNOWN account.api_status = API_STATUS_OK diff --git a/app/eve_api/views.py b/app/eve_api/views.py index ce1f0d3..c1e7408 100644 --- a/app/eve_api/views.py +++ b/app/eve_api/views.py @@ -26,8 +26,6 @@ def eveapi_add(request, post_save_redirect='/', template='eve_api/add.html'): if request.method == 'POST': form = EveAPIForm(request.POST) if form.is_valid(): - - acc = form.save() task = import_apikey_result.delay(api_key=acc.api_key, api_userid=acc.api_user_id, user=request.user.id) try: task.wait(10) @@ -62,9 +60,6 @@ def eveapi_update(request, userid, post_save_redirect='/', template='eve_api/upd form = EveAPIForm(request.POST, instance=acc) if form.is_valid(): if form.has_changed() and ('api_key' in form.changed_data): - #acc = form.save() - acc.api_keytype = API_KEYTYPE_UNKNOWN - acc.save() task = import_apikey_result.delay(api_key=acc.api_key, api_userid=acc.api_user_id, user=request.user.id) try: task.wait(30)