Changeset 37c15c4

Timestamp:

Mar 20, 2010, 5:54:38 AM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, client

Children:

86817cf, c1d9650

Parents:

c020a3b

git-author:

Alex Dehnert <adehnert@…> (03/20/10 05:54:38)

git-committer:

Alex Dehnert <adehnert@…> (03/20/10 05:54:38)

Message:

Pull defaults from user object not certificate

In order to make Remit work better on a Django
test server or possibly with non-MIT group
members, pull data like name and email from the
user object instead of certificate, since as
of Trac #7 getting resolved we have that data.

Closes #11

File:

• remit/vouchers/views.py (modified) (2 diffs)

remit/vouchers/views.py

@@ -101 +101 @@
     new_request.budget_term = term_obj
 
-    # Prefill from certs
+    # Prefill from user information (itself prefilled from LDAP now)
     initial = {}
-    try:
-        name = http_request.META['SSL_CLIENT_S_DN_CN']
-        names = name.split(' ')
-        initial['check_to_first_name'] = names[0]
-        initial['check_to_last_name'] = names[-1]
-    except KeyError:
-        pass
-    try:
-        initial['check_to_email'] = http_request.META['SSL_CLIENT_S_DN_Email']
-    except KeyError:
-        pass
+    initial['check_to_first_name'] = http_request.user.first_name
+    initial['check_to_last_name']  = http_request.user.last_name
+    initial['check_to_email']      = http_request.user.email
 
     if http_request.method == 'POST': # If the form has been submitted...
@@ -195 +187 @@
         # Prefill from certs / config
         initial = {}
-        try:
-            name = http_request.META['SSL_CLIENT_S_DN_CN']
-            initial['name'] = name
-        except KeyError:
-            pass
+        initial['name'] = '%s %s' % (http_request.user.first_name, http_request.user.last_name, )
         if settings.SIGNATORY_EMAIL:
             initial['email'] = settings.SIGNATORY_EMAIL
         else:
-            try:
-                initial['email'] = http_request.META['SSL_CLIENT_S_DN_Email']
-            except KeyError:
-                pass
+            initial['email'] = http_request.user.email
 
         approve_message = ''