Fix bad merge

[cascardo/ema.git] / eventos / views.py

diff --git a/eventos/views.py b/eventos/views.py
index a282844..c155bf2 100644 (file)
--- a/eventos/views.py
+++ b/eventos/views.py
@@ -27,6 +27,7 @@ from django.template import RequestContext, Context, loader
 from eventos.models import Palestrante, Trabalho, TipoTrabalho, Trilha, Evento, Improve
 from eventos.forms import RegisterSpeaker
 from django.db.models import Q
+import smtplib
 
 forbidden = \
     HttpResponseForbidden('<h2>You are not allowed to do this action.<h2>')
@@ -142,12 +143,12 @@ def speaker_details(request, lid):
     speaker = get_object_or_404(Palestrante, pk=lid)
     d = {'speaker' : speaker}
     if not hasattr(request.user, 'palestrante_set'):
-        return render_to_response('eventos/speaker-details2.html', Context(d),
+        return render_to_response('eventos/speaker-view.html', Context(d),
                                   context_instance=RequestContext(request))
 
     entity = request.user.palestrante_set.get()
     if entity.id != int(lid):
-        return render_to_response('eventos/speaker-details2.html', Context(d),
+        return render_to_response('eventos/speaker-view.html', Context(d),
                                   context_instance=RequestContext(request))
 
     form = SpeakerForm(request.POST or None, instance=entity)
@@ -306,7 +307,8 @@ def talk_improve(request, tid):
         return forbidden
 
     talk = get_object_or_404(Trabalho, pk=tid)
-    speaker = talk.palestrante
+    speakers = [i for i in talk.outros_palestrantes.all()]
+    speakers = [ talk.palestrante ] + speakers
     improve = Improve.objects.filter(trabalho=talk)
 
     # building the form
@@ -321,11 +323,24 @@ def talk_improve(request, tid):
         if cleaned['trabalho'].evento.id != event.id:
             return forbidden
 
+        emails = [i.email for i in speakers]
+        user = cleaned['usuario'].get_full_name()
+        comments = cleaned['comentario']
+        msg = (u"From: emsl@minaslivre.org\r\nTo: %s\r\n"
+               u"Subject: Comentário em seu Trabalho EMSL 2008\r\n"
+               u"Content-Type: text/plain; charset=utf-8\r\n"
+               u"\r\n %s comentou seu trabalho.\r\n%s\r\r\n"
+               % (", ".join(emails), user, comments))
+        smtp = smtplib.SMTP("localhost")
+        smtp.sendmail("emsl@minaslivre.org", emails, str(msg.encode("utf8")))
+        smtp.quit()
+
         instance = form.save()
         return HttpResponseRedirect('/improve/%d/' % talk.id)
 
-    c = {'talk': talk, 'form': form, 'improve': improve, 'speaker': speaker}
-    return render_to_response('eventos/talk_improve.html', Context(c),
+    c = {'talk': talk, 'form': form, 'improve': improve,
+         'len_comments': len(improve), 'speakers': speakers}
+    return render_to_response('eventos/talk-improve.html', Context(c),
                               context_instance=RequestContext(request))
 
 def subscribe(request):