Revision 8f5a3a06 snf-astakos-app/astakos/im/management/commands/inviteuser.py

b/snf-astakos-app/astakos/im/management/commands/inviteuser.py
33 33

  
34 34
import socket
35 35

  
36
from smtplib import SMTPException
37

  
38 36
from django.core.management.base import BaseCommand, CommandError
39 37
from django.db.utils import IntegrityError
40 38

  
41
from astakos.im.functions import invite
39
from astakos.im.functions import invite, SendMailError
42 40

  
43 41
from ._common import get_user
44 42

  
......
60 58
            realname = args[2]
61 59
            
62 60
            try:
63
                invite(inviter, email, realname)
61
                invitation = Invitation(username = email, realname=realname, inviter=inviter)
62
                invite(invitation, inviter)
64 63
                self.stdout.write("Invitation sent to '%s'\n" % (email,))
65
            except (SMTPException, socket.error) as e:
66
                raise CommandError("Error sending the invitation")
64
            except SendMailError, e:
65
                raise CommandError(e.message)
67 66
            except IntegrityError, e:
68 67
                raise CommandError("There is already an invitation for %s" % (email,))
69 68
        else:

Also available in: Unified diff