Morpheus/gestioCOF
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/zolicss

Browse source
This commit is contained in:
Qwann 2016-07-14 21:22:27 +02:00
commit 3bffc2ce69
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bda/urls.py
View file

@ -5,33 +5,33 @@ from bda.views import SpectacleListView
urlpatterns = patterns( urlpatterns = patterns(
'', '',
url(r'inscription/(?P<tirage_id>\d+)$', url(r'^inscription/(?P<tirage_id>\d+)$',
'bda.views.inscription', 'bda.views.inscription',
name='bda-tirage-inscription'), name='bda-tirage-inscription'),
url(r'places/(?P<tirage_id>\d+)$', url(r'^places/(?P<tirage_id>\d+)$',
'bda.views.places', 'bda.views.places',
name="bda-places-attribuees"), name="bda-places-attribuees"),
url(r'places/(?P<tirage_id>\d+)/places_bda.ics$', url(r'^places/(?P<tirage_id>\d+)/places_bda.ics$',
'bda.views.places_ics', 'bda.views.places_ics',
name="bda-places-attribuees-ics"), name="bda-places-attribuees-ics"),
url(r'revente/(?P<tirage_id>\d+)$', url(r'^revente/(?P<tirage_id>\d+)$',
'bda.views.revente', 'bda.views.revente',
name='bda-revente'), name='bda-revente'),
url(r'etat-places/(?P<tirage_id>\d+)$', url(r'^etat-places/(?P<tirage_id>\d+)$',
'bda.views.etat_places', 'bda.views.etat_places',
name='bda-etat-places'), name='bda-etat-places'),
url(r'tirage/(?P<tirage_id>\d+)$', 'bda.views.tirage'), url(r'^tirage/(?P<tirage_id>\d+)$', 'bda.views.tirage'),
url(r'spectacles/(?P<tirage_id>\d+)$', url(r'^spectacles/(?P<tirage_id>\d+)$',
SpectacleListView.as_view(), SpectacleListView.as_view(),
name="bda-liste-spectacles"), name="bda-liste-spectacles"),
url(r'spectacles/(?P<tirage_id>\d+)/(?P<spectacle_id>\d+)$', url(r'^spectacles/(?P<tirage_id>\d+)/(?P<spectacle_id>\d+)$',
"bda.views.spectacle", "bda.views.spectacle",
name="bda-spectacle"), name="bda-spectacle"),
url(r'spectacles-ics/(?P<tirage_id>\d+)$', url(r'^spectacles-ics/(?P<tirage_id>\d+)$',
'bda.views.liste_spectacles_ics', 'bda.views.liste_spectacles_ics',
name="bda-liste-spectacles-ics"), name="bda-liste-spectacles-ics"),
url(r'spectacles/unpaid/(?P<tirage_id>\d+)$', url(r'^spectacles/unpaid/(?P<tirage_id>\d+)$',
"bda.views.unpaid", "bda.views.unpaid",
name="bda-unpaid"), name="bda-unpaid"),
url(r'mails-rappel/(?P<spectacle_id>\d+)$', "bda.views.send_rappel"), url(r'^mails-rappel/(?P<spectacle_id>\d+)$', "bda.views.send_rappel"),
) )

4
gestioncof/models.py
View file

@ -94,7 +94,8 @@ class CustomMail(models.Model):
blank=True) blank=True)
class Meta: class Meta:
verbose_name = "Mails personnalisables" verbose_name = "Mail personnalisable"
verbose_name_plural = "Mails personnalisables"
def __unicode__(self): def __unicode__(self):
return u"%s: %s" % (self.shortname, self.title) return u"%s: %s" % (self.shortname, self.title)
@ -158,6 +159,7 @@ class EventOptionChoice(models.Model):
class Meta: class Meta:
verbose_name = "Choix" verbose_name = "Choix"
verbose_name_plural = "Choix"
def __unicode__(self): def __unicode__(self):
return unicode(self.value) return unicode(self.value)