AFPy/PonyConf
AFPy
/
PonyConf
7
2
Fork 3
Code Issues 10 Pull Requests 1 Projects Releases Wiki Activity

fix conference opening and closing issue

This commit is contained in:
Élie Bouttier 2016-09-28 22:00:06 +02:00
parent 8e8c3dc6c7
commit e8db55693a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proposals/views.py
View File

@ -54,13 +54,14 @@ def conference(request):
@login_required
def participate(request):
site = get_current_site(request)
conf = Conference.objects.get(site=site)
talks = Talk.objects.filter(site=site)
my_talks = talks.filter(speakers=request.user)
proposed_talks = talks.exclude(speakers=request.user).filter(proposer=request.user)
return render(request, 'proposals/participate.html', {
'my_talks': my_talks,
'proposed_talks': proposed_talks,
'conf': site.conference,
'conf': conf,
})
@staff_required
@ -143,7 +144,8 @@ def talk_edit(request, talk=None):
if not talk.is_editable_by(request.user):
raise PermissionDenied()
else: # add new talk
if not site.conference.cfp_is_open():
conf = Conference.objects.get(site=site)
if not conf.cfp_is_open():
raise PermissionDenied()
form = TalkForm(request.POST or None, instance=talk, site=site)
if talk: