From 799cd0231b17bbe87ca82aa099dc398766550b60 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 8 Jun 2012 20:00:55 +0100 Subject: [PATCH] Added support for corp calls on EDKAPI --- app/api/handlers/v1.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/api/handlers/v1.py b/app/api/handlers/v1.py index bfc96ec..b094319 100644 --- a/app/api/handlers/v1.py +++ b/app/api/handlers/v1.py @@ -307,8 +307,11 @@ class EDKApiHandler(BaseHandler): def read(self, request): alliance = request.GET.get('alliance', None) - if not alliance: - return {'auth': 'missing', 'missing': 'alliance'} - - objs = EVEAccount.objects.filter(characters__corporation__alliance=alliance, api_keytype=API_KEYTYPE_CORPORATION, api_status=API_STATUS_OK).extra(where=['(api_accessmask & 256) > 0']) + corporation = request.GET.get('corporation', None) + if not alliance and not corporation: + return {'auth': 'missing', 'missing': ['alliance', 'corp']} + if alliance: + objs = EVEAccount.objects.filter(characters__corporation__alliance=alliance, api_keytype=API_KEYTYPE_CORPORATION, api_status=API_STATUS_OK).extra(where=['(api_accessmask & 256) > 0']) + elif corporation: + objs = EVEAccount.objects.filter(characters__corporation=corporation, api_keytype=API_KEYTYPE_CORPORATION, api_status=API_STATUS_OK).extra(where=['(api_accessmask & 256) > 0']) return objs.values('api_user_id', 'api_key', 'characters__id', 'characters__name', 'characters__corporation__name')