From 9b25eebc4a53668104e2ffccf7a7b6debd0bf7f3 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Mon, 1 Mar 2010 14:18:03 +0000
Subject: [PATCH] Actually make the default values work

---
 sso/forms.py | 4 ----
 sso/views.py | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/sso/forms.py b/sso/forms.py
index aa3d00a..3aa3517 100644
--- a/sso/forms.py
+++ b/sso/forms.py
@@ -30,14 +30,10 @@ def UserServiceAccountForm(user):
     """ Generate a Service Account form based on the user's permissions """
 
     services = Service.objects.filter(groups__in=user.groups.all())
-    defaultuser = user.username
-    defaultpasswd = user.get_profile().default_service_passwd
 
     class ServiceAccountForm(forms.Form):
         service = forms.ModelChoiceField(queryset=services)
         username = ServiceUsernameField(min_length=4,max_length=50)
         password = forms.CharField(label = u'Password',widget = forms.PasswordInput(render_value=False)) 
 
-        default_data = { 'username': defaultuser, 'password': defaultpasswd }
-
     return ServiceAccountForm
diff --git a/sso/views.py b/sso/views.py
index f859591..815ef15 100644
--- a/sso/views.py
+++ b/sso/views.py
@@ -88,6 +88,7 @@ def service_add(request):
             acc = ServiceAccount()
 
             acc.user = request.user
+
             acc.service = form.cleaned_data['service']
             acc.username = form.cleaned_data['username']
             acc.password = form.cleaned_data['password']
@@ -95,7 +96,8 @@ def service_add(request):
             acc.save()
             return HttpResponseRedirect(reverse('sso.views.profile')) # Redirect after POST
     else:
-        form = clsform() # An unbound form
+        defaults = { 'username': request.user.username, 'password': request.user.get_profile().default_service_passwd }
+        form = clsform(defaults) # An unbound form
 
     return render_to_response('sso/serviceaccount.html', {
         'form': form,