projects
/
cascardo
/
ema.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bad merge
[cascardo/ema.git]
/
eventos
/
views.py
diff --git
a/eventos/views.py
b/eventos/views.py
index
6103045
..
c155bf2
100644
(file)
--- a/
eventos/views.py
+++ b/
eventos/views.py
@@
-143,12
+143,12
@@
def speaker_details(request, lid):
speaker = get_object_or_404(Palestrante, pk=lid)
d = {'speaker' : speaker}
if not hasattr(request.user, 'palestrante_set'):
speaker = get_object_or_404(Palestrante, pk=lid)
d = {'speaker' : speaker}
if not hasattr(request.user, 'palestrante_set'):
- return render_to_response('eventos/speaker-
details2
.html', Context(d),
+ return render_to_response('eventos/speaker-
view
.html', Context(d),
context_instance=RequestContext(request))
entity = request.user.palestrante_set.get()
if entity.id != int(lid):
context_instance=RequestContext(request))
entity = request.user.palestrante_set.get()
if entity.id != int(lid):
- return render_to_response('eventos/speaker-
details2
.html', Context(d),
+ return render_to_response('eventos/speaker-
view
.html', Context(d),
context_instance=RequestContext(request))
form = SpeakerForm(request.POST or None, instance=entity)
context_instance=RequestContext(request))
form = SpeakerForm(request.POST or None, instance=entity)
@@
-340,7
+340,7
@@
def talk_improve(request, tid):
c = {'talk': talk, 'form': form, 'improve': improve,
'len_comments': len(improve), 'speakers': speakers}
c = {'talk': talk, 'form': form, 'improve': improve,
'len_comments': len(improve), 'speakers': speakers}
- return render_to_response('eventos/talk
_
improve.html', Context(c),
+ return render_to_response('eventos/talk
-
improve.html', Context(c),
context_instance=RequestContext(request))
def subscribe(request):
context_instance=RequestContext(request))
def subscribe(request):