Style minor fixes

[astakos] / snf-astakos-app / astakos / im / functions.py

diff --git a/snf-astakos-app/astakos/im/functions.py b/snf-astakos-app/astakos/im/functions.py
index f9c1d50..b1200c2 100644 (file)
--- a/snf-astakos-app/astakos/im/functions.py
+++ b/snf-astakos-app/astakos/im/functions.py
@@ -38,6 +38,8 @@ from django.utils.translation import ugettext as _
 from django.template.loader import render_to_string
 from django.core.mail import send_mail
 from django.core.urlresolvers import reverse
+from django.core.exceptions import ValidationError
+
 from urllib import quote
 from urlparse import urljoin
 from smtplib import SMTPException
@@ -100,7 +102,7 @@ def send_invitation(invitation, template_name='im/invitation.txt'):
     Raises SendInvitationError
     """
     subject = _('Invitation to %s alpha2 testing' % SITENAME)
-    url = '%s?code=%d' % (urljoin(BASEURL, reverse('astakos.im.views.signup')), invitation.code)
+    url = '%s?code=%d' % (urljoin(BASEURL, reverse('astakos.im.views.index')), invitation.code)
     message = render_to_string('im/invitation.txt', {
                 'invitation': invitation,
                 'url': url,
@@ -158,7 +160,7 @@ def activate(user, email_template_name='im/welcome_email.txt'):
     """
     Activates the specific user and sends email.
     
-    Raises SendGreetingError
+    Raises SendGreetingError, ValidationError
     """
     user.is_active = True
     user.save()
@@ -178,11 +180,13 @@ def invite(invitation, inviter, email_template_name='im/welcome_email.txt'):
 
 def set_user_credibility(email, has_credits):
     try:
-        user = AstakosUser.objects.get(email=email)
+        user = AstakosUser.objects.get(email=email, is_active=True)
         user.has_credits = has_credits
         user.save()
     except AstakosUser.DoesNotExist, e:
         logger.exception(e)
+    except ValidationError, e:
+        logger.exception(e)
 
 class SendMailError(Exception):
     pass