From: Thadeu Lima de Souza Cascardo Date: Fri, 7 Nov 2008 13:23:40 +0000 (-0200) Subject: Show all speakers in a talk when improving X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fema.git;a=commitdiff_plain;h=a8cba117d7b7f80ac0f18a0481cb3eefbbed4852;ds=sidebyside Show all speakers in a talk when improving --- diff --git a/eventos/templates/eventos/talk_improve.html b/eventos/templates/eventos/talk_improve.html index 89c9d2a..ffdb648 100644 --- a/eventos/templates/eventos/talk_improve.html +++ b/eventos/templates/eventos/talk_improve.html @@ -3,7 +3,9 @@ {% block content %}

Aprimorar Trabalho: {{ talk.titulo }}

+{% for speaker in speakers %}
Palestrante: {{ speaker.nome }}
+{% endfor %}
trilha: {{ talk.trilha }}
Tipo: {{ talk.tipo }}
Descricao curta: {{ talk.descricao_curta}}
diff --git a/eventos/views.py b/eventos/views.py index af5d498..5427973 100644 --- a/eventos/views.py +++ b/eventos/views.py @@ -306,7 +306,8 @@ def talk_improve(request, tid): return forbidden talk = get_object_or_404(Trabalho, pk=tid) - speaker = talk.palestrante + speakers = [i for i in talk.outros_palestrantes.all()] + speakers = [ talk.palestrante ] + speakers improve = Improve.objects.filter(trabalho=talk) # building the form @@ -325,7 +326,7 @@ def talk_improve(request, tid): return HttpResponseRedirect('/improve/%d/' % talk.id) c = {'talk': talk, 'form': form, 'improve': improve, - 'len_comments': len(improve), 'speaker': speaker} + 'len_comments': len(improve), 'speakers': speakers} return render_to_response('eventos/talk_improve.html', Context(c), context_instance=RequestContext(request))