Browse files

Merge cguardia-invitation-bio

  • Loading branch information...
2 parents ac5f7c3 + eb78476 commit d1e05d7d6d846640842020957c49e20a7c93f6ce @chrisrossi chrisrossi committed Jul 18, 2012
Showing with 10 additions and 0 deletions.
  1. +3 −0 CHANGES.txt
  2. +1 −0 karl/views/members.py
  3. +6 −0 karl/views/tests/test_members.py
View
3 CHANGES.txt
@@ -5,8 +5,11 @@ Unreleased
----------
- Profile owners can now deactivate their own profiles.
+
- Ux2 template for deactivation.
+- Make sure biography field is passed into created profile on invitations.
+
3.90 (2012-07-12)
-----------------
View
1 karl/views/members.py
@@ -723,6 +723,7 @@ def handle_submit(self, converted):
country=converted['country'],
websites=converted['websites'],
date_format=converted['date_format'],
+ biography=converted['biography'],
languages=converted['languages']
)
profiles[username] = profile
View
6 karl/views/tests/test_members.py
@@ -319,6 +319,7 @@ def remember(self, environ, identity):
'organization':'organization', 'location':'location',
'country':'country', 'websites':['website'],
'languages':'languages', 'date_format':'en-US',
+ 'biography':'bio',
}
karltesting.registerDummyRenderer(
'karl.views:templates/email_accept_invitation.pt')
@@ -331,6 +332,11 @@ def remember(self, environ, identity):
profiles = community['profiles']
self.failUnless('username' in profiles)
self.assertEqual(workflow.initialized,[profiles['username']])
+ profile = profiles['username']
+ self.assertEqual('phone', profile.phone)
+ self.assertEqual('firstname', profile.firstname)
+ self.assertEqual('lastname', profile.lastname)
+ self.assertEqual('bio', profile.biography)
self.failIf('invite' in community)
self.assertEqual(len(mailer), 1)

0 comments on commit d1e05d7

Please sign in to comment.