2 files changed, 3 insertions, 8 deletions
diff --git a/coip/apps/invitation/models.py b/coip/apps/invitation/models.py
index e6b7df4..64c3d5d 100644
--- a/coip/apps/invitation/models.py
+++ b/coip/apps/invitation/models.py
@@ -6,11 +6,7 @@ Created on Jun 23, 2010
 from django.db import models
 from django.contrib.auth.models import User
 from coip.apps.name.models import Name
-import datetime
-from pprint import pformat
 from django.core.mail import send_mail
-from coip.apps.userprofile.models import last_used_profile
-import logging
 from coip.settings import PREFIX_URL, NOREPLY
 
 class Invitation(models.Model):
@@ -29,8 +25,7 @@ class Invitation(models.Model):
     def __unicode__(self):
         return "%s invited to %s by %s" % (self.email,self.name,self.inviter)
         
-    def send_email(self):
-        pinviter = last_used_profile(self.inviter)
+    def send_email(self,user):
         send_mail('Invitation to join \'%s\'' % (self.name.shortname()),
                   '''
 %s (%s) has invited you to join \'%s\':
@@ -45,7 +40,7 @@ If you want to accept the invitation open this link in your browser:
 To view information about \'%s\' open this link in your browser:
 %s
 
-''' % (pinviter.display_name,pinviter.identifier,self.name.shortname(),self.message,PREFIX_URL,self.nonce,self.name.shortname(),self.name.url()),
+''' % (user.get_full_name,user.identifier.value,self.name.shortname(),self.message,PREFIX_URL,self.nonce,self.name.shortname(),self.name.url()),
                   NOREPLY,
                   [self.email], 
                   fail_silently=False)
diff --git a/coip/apps/invitation/views.py b/coip/apps/invitation/views.py
index 542728b..b0b1fb9 100644
--- a/coip/apps/invitation/views.py
+++ b/coip/apps/invitation/views.py
@@ -27,7 +27,7 @@ def invite(request,id):
         form = InvitationForm(request.POST,instance=invitation)
         if form.is_valid():
             invitation = form.save()
-            invitation.send_email()
+            invitation.send_email(user)
             return HttpResponseRedirect("/name/id/%d" % (name.id))
     else:
         exp = datetime.datetime.now()+datetime.timedelta(days=1)