projects
/
cascardo
/
ema.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4139200
)
Allowing viewing and editing of talk for a co-speaker
author
Marcelo Jorge Vieira (metal
<metal@alucinados.com>
Fri, 24 Oct 2008 14:53:03 +0000
(12:53 -0200)
committer
Lincoln de Sousa
<lincoln@alfaiati.net>
Fri, 24 Oct 2008 14:58:32 +0000
(12:58 -0200)
eventos/views.py
patch
|
blob
|
history
diff --git
a/eventos/views.py
b/eventos/views.py
index
d0ef185
..
f8b8240
100644
(file)
--- a/
eventos/views.py
+++ b/
eventos/views.py
@@
-25,6
+25,7
@@
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext, Context, loader
from eventos.models import Palestrante, Trabalho, TipoTrabalho, Trilha, Evento
from eventos.forms import RegisterSpeaker
from django.template import RequestContext, Context, loader
from eventos.models import Palestrante, Trabalho, TipoTrabalho, Trilha, Evento
from eventos.forms import RegisterSpeaker
+from django.db.models import Q
forbidden = \
HttpResponseForbidden('<h2>You are not allowed to do this action.<h2>')
forbidden = \
HttpResponseForbidden('<h2>You are not allowed to do this action.<h2>')
@@
-135,7
+136,9
@@
def speaker_talks(request, lid):
if entity.id != int(lid):
return forbidden
if entity.id != int(lid):
return forbidden
- talks = Trabalho.objects.filter(palestrante=entity)
+ talks = Trabalho.objects.filter(
+ Q(palestrante=entity) | Q(outros_palestrantes=entity) )
+
c = {'speaker': entity, 'talks': talks}
return render_to_response('eventos/talk-list.html', Context(c),
context_instance=RequestContext(request))
c = {'speaker': entity, 'talks': talks}
return render_to_response('eventos/talk-list.html', Context(c),
context_instance=RequestContext(request))