From: Corentin Wallez <corentin@wallez.net>
Date: Sat, 2 Feb 2013 18:29:30 +0000 (+0000)
Subject: events - fix models
X-Git-Url: http://git.polytechnique.org/?p=xnet;a=commitdiff_plain;h=99c4a1cb213a429081486740a65167dba8128740

events - fix models

* do not translate related_name
* an Event is linked to a group
---

diff --git a/xnet/events/models.py b/xnet/events/models.py
index f599cf4..a5a735d 100644
--- a/xnet/events/models.py
+++ b/xnet/events/models.py
@@ -21,9 +21,10 @@ class Event(models.Model):
 
     short = models.SlugField(max_length=40, verbose_name=_(u"nom raccourci"))
     main_description = models.OneToOneField('events.EventDescription', null=True, blank=True,
-            verbose_name=_(u"description principale"), related_name=_(u"+"))
+            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')
     simple = models.BooleanField(verbose_name=_(u"simple"))
-    creator = models.ForeignKey(accounts_models.Account, verbose_name=_(u"créateur"), related_name=_(u"created_events"))
 
     registration_end = models.DateTimeField(null=True, blank=True,
             verbose_name=_(u"date limite d'inscription"))
@@ -48,7 +49,7 @@ class Event(models.Model):
 class EventDescription(models.Model):
     name = models.CharField(max_length=100, verbose_name=_(u"nom"))
     description = models.CharField(max_length=1000, verbose_name=_(u"description"))
-    event = models.ForeignKey(Event, verbose_name=_(u"événement parent"), related_name=_(u"descriptions"))
+    event = models.ForeignKey(Event, verbose_name=_(u"événement parent"), related_name='descriptions')
     registration_limit = models.IntegerField(verbose_name=_(u"limites du nombre d'inscrits"))
     main = models.BooleanField(verbose_name=_(u"principale"))
 
@@ -64,7 +65,7 @@ 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"),
-            related_name=_(u"price_options"))
+            related_name='price_options')
 
     def __unicode__(self):
         return self.name
@@ -91,11 +92,11 @@ class RegistrationWorkflow(xwf_models.Workflow):
 
 class Registration(models.Model):
     user = models.ForeignKey(accounts_models.Account, verbose_name=_(u"utilisateur enregistré"),
-            related_name=_(u"event_registrations"))
+            related_name='event_registrations')
     dn_event = models.ForeignKey(EventDescription, verbose_name=_(u"événement associé"),
-            related_name=_(u"registrations"))
+            related_name='registrations')
     option = models.ForeignKey(PriceOption, verbose_name=_(u"options associées"),
-            related_name=_(u"registrations"))
+            related_name='registrations')
     date_registered = models.DateTimeField(verbose_name=_(u"date d'enregistrement"))
     state = xwf_models.StateField(RegistrationWorkflow, verbose_name=u"état")