From 8b62502983ca646104f22ecb56cf97ff8922756a Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 18 Aug 2011 10:41:41 +0200 Subject: new profile-model --- coip/apps/invitation/models.py | 7 ++----- coip/apps/invitation/views.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'coip/apps/invitation') diff --git a/coip/apps/invitation/models.py b/coip/apps/invitation/models.py index e6b7df4..fabc145 100644 --- a/coip/apps/invitation/models.py +++ b/coip/apps/invitation/models.py @@ -6,10 +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 @@ -29,8 +26,8 @@ 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,request): + pinviter = request.user.get_profile() send_mail('Invitation to join \'%s\'' % (self.name.shortname()), ''' %s (%s) has invited you to join \'%s\': diff --git a/coip/apps/invitation/views.py b/coip/apps/invitation/views.py index 542728b..f227508 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(request) return HttpResponseRedirect("/name/id/%d" % (name.id)) else: exp = datetime.datetime.now()+datetime.timedelta(days=1) -- cgit v1.1