Revision c063d1c3
b/snf-astakos-app/astakos/im/messages.py | ||
---|---|---|
128 | 128 |
NOTIFICATION_SENT = 'Your request for an account was successfully received and is now pending approval. \ |
129 | 129 |
You will be notified by email in the next few days. \ |
130 | 130 |
Thanks for your interest in ~okeanos! The GRNET team.' |
131 |
ACTIVATION_SENT = 'Activation sent.'
|
|
131 |
ACTIVATION_SENT = 'An email containing your activation link was sent to your email address.'
|
|
132 | 132 |
|
133 | 133 |
REGISTRATION_COMPLETED = 'Registration completed you can now login to your account.' |
134 | 134 |
|
b/snf-astakos-app/astakos/im/views.py | ||
---|---|---|
713 | 713 |
|
714 | 714 |
def send_activation(request, user_id, template_name='im/login.html', extra_context=None): |
715 | 715 |
|
716 |
if request.user.is_authenticated(): |
|
717 |
messages.error(request, 'You are already signed in.') |
|
718 |
return HttpResponseRedirect(reverse('edit_profile')) |
|
719 |
|
|
716 | 720 |
if settings.MODERATION_ENABLED: |
717 | 721 |
raise PermissionDenied |
718 | 722 |
|
... | ... | |
726 | 730 |
send_activation_func(u) |
727 | 731 |
msg = _(astakos_messages.ACTIVATION_SENT) |
728 | 732 |
messages.success(request, msg) |
733 |
return HttpResponseRedirect('/im/') |
|
734 |
|
|
729 | 735 |
except SendMailError, e: |
730 | 736 |
messages.error(request, e) |
731 | 737 |
return render_response( |
Also available in: Unified diff