nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-14 14:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refer to eve_api.models, not the api_player file

Browse Source
This commit is contained in:
Andrew Williams
2010-12-07 16:41:08 +00:00
parent 59e086e720
commit 98ed469373
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sso/forms.py
View File

@@ -4,7 +4,7 @@ from django import forms
from django.contrib.auth.models import User from django.contrib.auth.models import User
import settings 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 sso.models import ServiceAccount, Service
from reddit.models import RedditAccount from reddit.models import RedditAccount
from registration.forms import RegistrationForm from registration.forms import RegistrationForm

8
sso/views.py
View File

@@ -13,7 +13,7 @@ from django.contrib.auth.decorators import login_required
from django.template import RequestContext from django.template import RequestContext
from django.core import serializers 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_api.tasks import import_apikey, import_apikey_result
from eve_proxy.models import ApiAccessLog from eve_proxy.models import ApiAccessLog
@@ -50,6 +50,12 @@ def characters(request, charid=0):
if charid: if charid:
character = get_object_or_404(EVEPlayerCharacter.objects.select_related('corporation', 'corporation__aliance'), id=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)) 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') characters = EVEPlayerCharacter.objects.select_related('corporation', 'corporation__alliance').filter(eveaccount__user=request.user).only('id', 'name', 'corporation__name', 'corporation__alliance__name')