DGNum/gestioCOF
16
2
Fork 1
Code Issues 78 Pull requests 14 Projects Releases 12 Packages Wiki Activity

Merge master

Browse source
This commit is contained in:
Martin Pépin 2016-06-09 01:58:03 +02:00
commit 6dfe363717
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bda/views.py
View file

@ -314,7 +314,7 @@ class SpectacleListView(ListView):
template_name = 'spectacle_list.html' template_name = 'spectacle_list.html'
def get_queryset(self): def get_queryset(self):
self.tirage = get_object_or_404(Tirage, id=self.kwargs['tirage_id']) self.tirage = get_object_or_404(Tirage, id=self.kwargs['tirage_id'])
categories = self.tirage.spectacle_set categories = self.tirage.spectacle_set.all()
return categories return categories
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super(SpectacleListView, self).get_context_data(**kwargs) context = super(SpectacleListView, self).get_context_data(**kwargs)

3
cof/urls.py
View file

@ -39,7 +39,8 @@ urlpatterns = patterns('',
url(r'^outsider/password-change$', url(r'^outsider/password-change$',
'django.contrib.auth.views.password_change'), 'django.contrib.auth.views.password_change'),
url(r'^outsider/password-change-done$', url(r'^outsider/password-change-done$',
'django.contrib.auth.views.password_change_done'), 'django.contrib.auth.views.password_change_done',
name='password_change_done'),
# Inscription d'un nouveau membre # Inscription d'un nouveau membre
url(r'^registration$', 'gestioncof.views.registration'), url(r'^registration$', 'gestioncof.views.registration'),
url(r'^registration/clipper/(?P<login_clipper>[\w-]+)$', url(r'^registration/clipper/(?P<login_clipper>[\w-]+)$',