From: yomguy Date: Tue, 15 Jan 2013 16:01:53 +0000 (+0100) Subject: add message to user when a question is validated X-Git-Tag: 0.9-probarreau~138 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f3e4b2e40270d473a603f1bd9b43dd0d9ebff6f4;p=teleforma.git add message to user when a question is validated --- diff --git a/teleforma/templates/postman/seminar_validated.txt b/teleforma/templates/postman/seminar_validated.txt new file mode 100644 index 00000000..438f54b2 --- /dev/null +++ b/teleforma/templates/postman/seminar_validated.txt @@ -0,0 +1,6 @@ +{% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %} +{% trans 'Congratulations!' %} + +{% trans 'You can continue to the next step of your seminar following this link' %}: + +http://{{ site.name }}{{ seminar_url }} diff --git a/teleforma/views/core.py b/teleforma/views/core.py index 36a0878c..1485eb9a 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -89,6 +89,8 @@ try: except: pass +from postman.models import * +from postman.utils import email_visitor, notify_user access_error = _('Access not allowed.') contact_message = _('Please login or contact the website administator to get a private access.') diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index e909ff15..388650dc 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -47,6 +47,7 @@ from django.template.context import Context from django.utils.html import escape from django.views.generic.detail import SingleObjectMixin from django.core.mail import EmailMessage +from django.template.loader import render_to_string import os from cgi import escape @@ -238,22 +239,31 @@ class AnswersView(ListView): answer = Answer.objects.get(id=id) answer.validate() user = answer.user + sender = request.user seminar = answer.question.seminar if seminar_validated(user, seminar): testimonial = Testimonial(user=user, seminar=seminar) testimonial.save() - email = EmailMessage() - text = 'Your training testimonial for the seminar : ' - email.subject = seminar.course.department.name + ' : ' + text + seminar.title - name, email.from_email = settings.ADMINS[0] - email.to = [user.email] - email.body = 'You have validated your training!' - email.send() - + site = Site.objects.get_current() + seminar_url = reverse('teleforma-seminar-detail', kwargs={'pk':seminar.id}) + ctx_dict = {'site': site, 'seminar_url': seminar_url,} + text = render_to_string('postman/seminar_validated.txt', ctx_dict) + mess = Message(sender=sender, recipient=user, + subject=_('Your answer has been validated'), + body=text) + mess.moderation_status = 'a' + mess.save() + notify_user(mess, 'acceptance') @jsonrpc_method('teleforma.reject_answer') def reject(request, id): answer = Answer.objects.get(id=id) + seminar = answer.question.seminar + user = answer.user + testimonials = Testimonial.objects.filter(user=user, seminar=seminar) + if testimonials: + for testimonial in testimonials: + testimonial.delete() answer.validated = False answer.status = 2 answer.save()