adicionando o link para o boleto

[cascardo/eventmanager.git] / views.py

diff --git a/views.py b/views.py
index 312ac45..791951d 100644 (file)
--- a/views.py
+++ b/views.py
@@ -21,6 +21,7 @@ from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext, Context, loader
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.models import Group, User
+from django.contrib.auth import authenticate, login
 from django.newforms import form_for_instance
 from django.core.mail import EmailMessage
 from django.db import transaction
@@ -165,14 +166,17 @@ def inscricao_individual(request):
         p.home_page = cd['home_page']
         p.save()
 
-        ok = True
+        u = authenticate(username=cd['nome_usuario'], password=cd['senha'])
+        login(request, u)
         transaction.commit()
+        ok = True
 
     c = {'form': form, 'ok': ok}
     return build_response(request, 'inscricao_individual.html', c)
 
 
 @enable_login_form
+@transaction.commit_manually
 def inscricao_caravana(request):
     form = InscricaoCaravana(request.POST or None)
     ok = False
@@ -206,6 +210,9 @@ def inscricao_caravana(request):
         c.save()
 
         ok = True
+        u = authenticate(username=cd['nome_usuario'], password=cd['senha'])
+        login(request, u)
+        transaction.commit()
 
     c = {'form': form, 'ok': ok}
     return build_response(request, 'inscricao_caravana.html', c)
@@ -226,7 +233,7 @@ def submeter_trabalho(request):
         t.descricao_curta = cd['descricao_curta']
         t.descricao_longa = cd['descricao_longa']
         t.recursos = cd['recursos']
-        t.evento = Evento.objects.get(pk=1) # let the hammer play arround!
+        t.evento = Evento.objects.get(pk=1) # XXX: let the hammer play arround!
         t.save()
 
         logged_in = request.user.palestrante_set.get()
@@ -264,20 +271,19 @@ def editar_trabalho(request, codigo):
         # não palestrante...
         c = {'palestrante': 0}
         return build_response(request, 'meus_trabalhos.html', c)
+
     trabalho = get_object_or_404(Trabalho, id=codigo, palestrante=p)
     Formulario = form_for_instance(trabalho)
-    if request.method == 'POST':
-        form = Formulario(request.POST)
-        if form.is_valid():
-            form.save()
-            t = Trabalho.objects.filter(palestrante=p)
-            c = {'trabalhos': t, 'palestrante': 1}
-            c['editado_sucesso']=trabalho.titulo
-            return build_response(request, 'meus_trabalhos.html', c)
-    else:
-        form = Formulario()
+
+    form = Formulario(request.POST or None)
+    if request.POST and form.is_valid():
+        form.save()
+        t = Trabalho.objects.filter(palestrante=p)
+        c = {'trabalhos': t, 'palestrante': 1}
+        c['editado_sucesso'] = trabalho.titulo
+        return build_response(request, 'meus_trabalhos.html', c)
     
-    c = {'formulario':form}
+    c = {'formulario': form}
     return build_response(request, 'editar_trabalho.html', c)