X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=xnet%2Fevents%2Fmodels.py;h=ae2f08a90a3bebdceaedb57980afbe3688aa7626;hb=39e8fe01ea7136f372ebd6f3e91400d56a6b29c8;hp=c453ca84e2e2c73ffa4d0b987d82c46402245657;hpb=639632cad9cdc64bbccbe874db87e0728925fd48;p=xnet diff --git a/xnet/events/models.py b/xnet/events/models.py index c453ca8..ae2f08a 100644 --- a/xnet/events/models.py +++ b/xnet/events/models.py @@ -21,7 +21,7 @@ class Event(models.Model): short = models.SlugField(max_length=40, unique=True, verbose_name=_(u"nom raccourci"), help_text=_(u"Texte court utilisé dans les URLs.")) - main_description = models.OneToOneField('events.EventDescription', null=True, blank=True, + main_description = models.OneToOneField('events.EventPart', null=True, blank=True, verbose_name=_(u"description principale"), related_name='+') group = models.ForeignKey(accounts_models.XGroup, verbose_name=_(u"groupe"), related_name='events') creator = models.ForeignKey(accounts_models.Account, verbose_name=_(u"créateur"), related_name='created_events') @@ -50,7 +50,7 @@ class Event(models.Model): verbose_name_plural = _(u"événements") -class EventDescription(models.Model): +class EventPart(models.Model): """A component of an event.""" name = models.CharField(max_length=100, verbose_name=_(u"nom")) @@ -72,7 +72,7 @@ class EventDescription(models.Model): class PriceOption(models.Model): name = models.CharField(max_length=100, verbose_name=_(u"nom")) amount = models.IntegerField(verbose_name=_(u"montant (centimes)")) - event_description = models.ForeignKey(EventDescription, verbose_name=_(u"description associée"), + event_description = models.ForeignKey(EventPart, verbose_name=_(u"description associée"), related_name='price_options') def __unicode__(self): @@ -102,7 +102,7 @@ class RegistrationWorkflow(xwf_models.Workflow): class Registration(models.Model): user = models.ForeignKey(accounts_models.Account, verbose_name=_(u"utilisateur enregistré"), related_name='event_registrations') - dn_event = models.ForeignKey(EventDescription, verbose_name=_(u"événement associé"), + dn_event = models.ForeignKey(EventPart, verbose_name=_(u"événement associé"), related_name='registrations', editable=False) option = models.ForeignKey(PriceOption, verbose_name=_(u"options associées"), related_name='registrations')