Revision 0a569195 snf-astakos-app/astakos/im/management/commands/sendactivation.py
b/snf-astakos-app/astakos/im/management/commands/sendactivation.py | ||
---|---|---|
33 | 33 |
|
34 | 34 |
from django.core.management.base import BaseCommand, CommandError |
35 | 35 |
|
36 |
from astakos.im.functions import send_verification |
|
36 |
from astakos.im.functions import send_verification, SendMailError
|
|
37 | 37 |
|
38 | 38 |
from ._common import get_user |
39 | 39 |
|
... | ... | |
46 | 46 |
raise CommandError("No user was given") |
47 | 47 |
|
48 | 48 |
for email_or_id in args: |
49 |
user = get_user(email_or_id) |
|
49 |
user = get_user(email_or_id, is_active=False)
|
|
50 | 50 |
if not user: |
51 |
self.stderr.write("Unknown user '%s'\n" % (email_or_id,)) |
|
52 |
continue |
|
53 |
|
|
54 |
if user.is_active: |
|
55 |
msg = "User '%s' already active\n" % (user.email,) |
|
56 |
self.stderr.write(msg) |
|
51 |
self.stderr.write("Unknown or already active user '%s'\n" % (email_or_id,)) |
|
57 | 52 |
continue |
58 | 53 |
|
59 | 54 |
try: |
... | ... | |
61 | 56 |
except SendMailError, e: |
62 | 57 |
raise CommandError(e.message) |
63 | 58 |
|
64 |
self.stdout.write("Activated '%s'\n" % (user.email,)) |
|
59 |
self.stdout.write("Activation sent to '%s'\n" % (user.email,)) |
Also available in: Unified diff