From 2d8856c742ccc11a57820f01f84aa7c82827b0dd Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Fri, 12 Mar 2010 12:19:21 +0000
Subject: [PATCH] Cleanup char/service selection, let the QuerySet do the work.

---
 sso/forms.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/sso/forms.py b/sso/forms.py
index da81a07..43e58fb 100644
--- a/sso/forms.py
+++ b/sso/forms.py
@@ -28,17 +28,8 @@ class EveAPIForm(forms.Form):
 def UserServiceAccountForm(user):
     """ Generate a Service Account form based on the user's permissions """
 
-    current_services = []
-    for sa in ServiceAccount.objects.filter(user=user):
-        current_services.append(sa.service)
-    services = set(Service.objects.filter(groups__in=user.groups.all())) - set(current_services)
-
-    eveacc = EVEAccount.objects.filter(user=user)
-    chars = []
-    for srv in services:
-        for char in eveacc.characters.all():
-            if char.corporation.group = srv.group and not char in chars:
-                chars.append(char)
+    services = Service.objects.filter(groups__in=user.groups.all()).exclude(id__in=ServiceAccount.objects.filter(user=user).values('service'))
+    chars = EVEPlayerCharacter.objects.filter(corporation__group__in=user.groups.all(),eveaccount__user=user)
 
     class ServiceAccountForm(forms.Form):
         """ Service Account Form """