Resolved conflict from last merge.

[cascardo/eventmanager.git] / views.py

diff --git a/views.py b/views.py
index 077786f..41223aa 100644 (file)
--- a/views.py
+++ b/views.py
@@ -31,12 +31,16 @@ from django.conf import settings
 from eventmanager.decorators import enable_login_form
 from eventmanager.conteudo.models import Noticia, Menu, Secao
 from eventmanager.eventos.models import *
+<<<<<<< HEAD/views.py
+from django.newforms import form_for_instance
+=======
 from eventmanager.forms import *
 
 from datetime import datetime
 import sha
 
 FROM_EMAIL = 'Emsl 2007 <noreply@minaslivre.org>'
+>>>>>>> 11faa820abeb69b688db5076aa4c1cc663dfeb53/views.py
 
 def build_response(request, template, extra={}):
     """
@@ -325,6 +329,32 @@ def meus_trabalhos(request):
     c = {'trabalhos': t, 'palestrante': 1}
     return build_response(request, 'meus_trabalhos.html', c)
 
+<<<<<<< HEAD/views.py
+@login_required
+@user_passes_test(lambda u:u.palestrante_set.count() == 1, login_url='/')
+def editar_trabalho(request,codigo):
+    try:
+        p = Palestrante.objects.get(usuario=request.user)
+    except Palestrante.DoesNotExist:
+        # 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()
+    
+    c = {'formulario':form}
+    return build_response(request, 'editar_trabalho.html', c)
+=======
 @login_required
 @user_passes_test(lambda u:u.palestrante_set.count() == 1, login_url='/')
 def editar_trabalho(request,codigo):
@@ -374,6 +404,7 @@ def editar_trabalho(request, codigo):
     c = {'formulario': form}
     return build_response(request, 'editar_trabalho.html', c)
 
+>>>>>>> 11faa820abeb69b688db5076aa4c1cc663dfeb53/views.py
 
 @login_required
 def meus_dados(request):