Merge git://192.168.0.77/home/gabriel/Desktop/Projetos/eventmanager

diff --combined views.py
index 5b3e5ee,4b5f557..edd63e4
--- 1/views.py
--- 2/views.py
+++ b/views.py
@@@ -23,6 -23,7 +23,7 @@@ from django.contrib.auth.decorators imp
  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.exceptions import ObjectDoesNotExist
  from django.core.mail import EmailMessage
  from django.db import transaction
  from django.http import get_host
@@@ -32,6 -33,7 +33,7 @@@ from eventmanager.decorators import ena
  from eventmanager.conteudo.models import Noticia, Menu, Secao
  from eventmanager.eventos.models import *
  from eventmanager.forms import *
+ from eventmanager.controllers import *
  
  from datetime import datetime
  import sha
@@@ -321,34 -323,11 +323,34 @@@ def meus_trabalhos(request)
          # não palestrante...
          c = {'palestrante': 0}
          return build_response(request, 'meus_trabalhos.html', c)
 -
      t = Trabalho.objects.filter(palestrante=p)
      c = {'trabalhos': t, 'palestrante': 1}
      return build_response(request, 'meus_trabalhos.html', c)
  
 +@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='/')
@@@ -374,6 -353,7 +376,6 @@@ def editar_trabalho(request, codigo)
      c = {'formulario': form}
      return build_response(request, 'editar_trabalho.html', c)
  
 -
  @login_required
  def meus_dados(request):
      try:
@@@ -396,6 -376,34 +398,34 @@@
      return build_response(request, 'editar_usuario.html', c)
  
  
+ @enable_login_form
+ def dados_palestrante(request, codigo):
+     d = {}
+     try:
+         d = {'dados_usuario': Palestrante.objects.get(id=codigo)}
+     except ObjectDoesNotExist:
+         d = {}
+     return build_response(request, 'dados_palestrante.html', d)
+ 
+ 
+ @enable_login_form
+ def dados_palestra(request, codigo):
+     try:
+         d = {'dados_palestra': Trabalho.objects.get(id=codigo)}
+     except ObjectDoesNotExist:
+         d = {}
+     return build_response(request, 'dados_palestra.html',d)
+ 
+ 
+ @enable_login_form
+ def programacao(request):
+     try:
+         d = {'aprovadas': Trabalho.objects.filter(aprovado=True)}
+     except ObjectDoesNotExist:
+         d = {}
+     return build_response(request, 'programacao.html',d)
+ 
+ 
  @enable_login_form
  def chamada_trabalhos(request):
      return build_response(request, 'chamada_trabalhos.html')