From f27f17fd21f51505baf716012eab80360fbd1726 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Tue, 7 Dec 2010 17:13:04 +0000 Subject: [PATCH] Character API now provides skills --- api/handlers.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/api/handlers.py b/api/handlers.py index f5726b1..5ee5486 100755 --- a/api/handlers.py +++ b/api/handlers.py @@ -216,7 +216,12 @@ class BlacklistHandler(BaseHandler): class CharacterHandler(BaseHandler): allowed_methods = ('GET') - exclude = ('_state',) + + fields = ('id', 'name', ('corporation', ('id', 'name', ('alliance', ('id', 'name')))), 'corporation_date', 'balance', 'total_sp', 'security_status', 'director', 'skillset') + + @classmethod + def skillset(cls, instance): + return instance.eveplayercharacterskill_set.all().values('skill__id', 'skill__name', 'level', 'skillpoints') def read(self, request): s = [] @@ -227,6 +232,5 @@ class CharacterHandler(BaseHandler): s = EVEPlayerCharacter.objects.filter(corporation__id=request.GET['corpid']) elif request.GET.get('allianceid', None): s = EVEPlayerCharacter.objects.filter(corporation__alliance__id=request.GET['allianceid']) - - return {'characters': s} + return s