From: www-data <www-data@mail.holoscopio.com>
Date: Sun, 30 Sep 2007 12:04:18 +0000 (-0300)
Subject: Fix conflict.
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Feventmanager.git;a=commitdiff_plain;h=1512191b2a85db8f56ad0be78c6a5bac014e9772

Fix conflict.
---

diff --git a/views.py b/views.py
index 41223aa..5b3e5ee 100644
--- a/views.py
+++ b/views.py
@@ -31,16 +31,12 @@ 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={}):
     """
@@ -329,32 +325,6 @@ 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):
@@ -404,8 +374,6 @@ 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):
     try: