diff --git a/members/views.py b/members/views.py index 97aead0..6fa608a 100644 --- a/members/views.py +++ b/members/views.py @@ -10,7 +10,6 @@ from django.utils.translation import ugettext as _ '''Email validation''' from django.db.models.signals import post_save from django.dispatch import receiver -from .tokens import email_token_generator from django.utils.http import urlsafe_base64_encode from django.utils.encoding import force_bytes from django.core.mail import send_mail @@ -450,32 +449,6 @@ def export_csv(request, *args, **kwargs): return response -#Email hooks for regiseration -# def validateEmail(request, *args, **kwargs): -# uidb64 = request.GET.get('uidb64') -# token = request.GET.get('token') -# if uidb64 is not None and token is not None: -# try: -# uid = urlsafe_base64_decode(bytes(uidb64, 'utf-8')) -# user = User.objects.get(pk=uid) -# if email_token_generator.check_token(user, token) and user.is_validated == 0: -# user.is_validated=True -# user.save() -# return HttpResponseRedirect('/validate/success/') -# except: -# pass -# return HttpResponseRedirect('/validate/failure/') - -# def validate_success(request, *args, **kwargs): -# context = {} -# context.success = True -# return render('activated.html') - -# def validate_fail(request, *args, **kwargs): -# context = {} -# context.success = False -# return render('activated.html') - def send_mail_wrapper(subject, message, email_to): send_mail( subject, @@ -485,20 +458,18 @@ def send_mail_wrapper(subject, message, email_to): fail_silently=False ) + @receiver(post_save, sender=Request) def email_on_request(sender, instance, created, **kwargs): if created: - #token = email_token_generator.make_token(instance) - #uid = urlsafe_base64_encode(force_bytes(instance.id)) subject = 'Test1' message = 'Please validate your email address\r\n' - #message += settings.VALIDATION_BASE_URL + uid.decode("utf-8") + '/' + token + '/\r\n' send_mail_wrapper(subject, message, instance.email) + @receiver(post_save, sender=Member) def email_on_accept(sender, instance, created, **kwargs): if created: subject = 'Test2' message = 'Jäsenhakemuksesi on hyväksytty!!!\r\n' send_mail_wrapper(subject, message, instance.email) -