Merge master
This commit is contained in:
commit
6dfe363717
2 changed files with 3 additions and 2 deletions
|
@ -314,7 +314,7 @@ class SpectacleListView(ListView):
|
|||
template_name = 'spectacle_list.html'
|
||||
def get_queryset(self):
|
||||
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
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super(SpectacleListView, self).get_context_data(**kwargs)
|
||||
|
|
|
@ -39,7 +39,8 @@ urlpatterns = patterns('',
|
|||
url(r'^outsider/password-change$',
|
||||
'django.contrib.auth.views.password_change'),
|
||||
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
|
||||
url(r'^registration$', 'gestioncof.views.registration'),
|
||||
url(r'^registration/clipper/(?P<login_clipper>[\w-]+)$',
|
||||
|
|
Loading…
Reference in a new issue