Revision 9a06d96f snf-astakos-app/astakos/im/activation_backends.py
b/snf-astakos-app/astakos/im/activation_backends.py | ||
---|---|---|
38 | 38 |
from astakos.im.models import AstakosUser |
39 | 39 |
from astakos.im.forms import LocalUserCreationForm, ShibbolethUserCreationForm |
40 | 40 |
from astakos.im.util import get_invitation |
41 |
from astakos.im.functions import send_verification, send_activation, \ |
|
42 |
send_admin_notification, activate |
|
41 |
from astakos.im.functions import (send_verification, send_activation, |
|
42 |
send_account_creation_notification, |
|
43 |
send_group_creation_notification, activate) |
|
43 | 44 |
from astakos.im.settings import INVITATIONS_ENABLED, MODERATION_ENABLED, SITENAME, RE_USER_EMAIL_PATTERNS |
44 | 45 |
|
45 | 46 |
import logging |
... | ... | |
129 | 130 |
send_activation(user, activation_template_name) |
130 | 131 |
return VerificationSent() |
131 | 132 |
else: |
132 |
send_admin_notification(
|
|
133 |
send_account_creation_notification(
|
|
133 | 134 |
template_name=admin_email_template_name, |
134 |
dictionary={'user': user, 'group_creation': True}, |
|
135 |
subject='%s alpha2 testing account notification' % SITENAME |
|
135 |
dictionary={'user': user, 'group_creation': True} |
|
136 | 136 |
) |
137 | 137 |
return NotificationSent() |
138 | 138 |
except BaseException, e: |
Also available in: Unified diff