From 98ed46937338da3f76ac2984ef986bda96945f2d Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Tue, 7 Dec 2010 16:41:08 +0000 Subject: [PATCH] Refer to eve_api.models, not the api_player file --- sso/forms.py | 2 +- sso/views.py | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sso/forms.py b/sso/forms.py index 5c6fcaf..cf97807 100644 --- a/sso/forms.py +++ b/sso/forms.py @@ -4,7 +4,7 @@ from django import forms from django.contrib.auth.models import User import settings -from eve_api.models.api_player import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation +from eve_api.models import EVEAccount, EVEPlayerCharacter, EVEPlayerCorporation from sso.models import ServiceAccount, Service from reddit.models import RedditAccount from registration.forms import RegistrationForm diff --git a/sso/views.py b/sso/views.py index 018db72..8e99b3b 100644 --- a/sso/views.py +++ b/sso/views.py @@ -13,7 +13,7 @@ from django.contrib.auth.decorators import login_required from django.template import RequestContext from django.core import serializers -from eve_api.models.api_player import EVEAccount, EVEPlayerCharacter +from eve_api.models import EVEAccount, EVEPlayerCharacter from eve_api.tasks import import_apikey, import_apikey_result from eve_proxy.models import ApiAccessLog @@ -50,6 +50,12 @@ def characters(request, charid=0): if charid: character = get_object_or_404(EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance'), id=charid) + skills = {} + for s in character.eveplayercharacterskill_set.all().order_by('skill__group__name', 'skill'): + if not s.skill.group.name in skills: + skills[s.skill.group.name] = [s] + else: + skills[s.skill.group.name].append(s) return render_to_response('sso/character.html', locals(), context_instance=RequestContext(request)) characters = EVEPlayerCharacter.objects.select_related('corporation', 'corporation__alliance').filter(eveaccount__user=request.user).only('id', 'name', 'corporation__name', 'corporation__alliance__name')