]> git.parisson.com Git - teleforma.git/commitdiff
Rename class
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 19 Jul 2017 09:41:13 +0000 (11:41 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 19 Jul 2017 09:41:13 +0000 (11:41 +0200)
teleforma/models/core.py
teleforma/models/crfpa.py

index dbe2cad27c97df0ec039c8b5e28c5a15cc47a08d..6b3966f152eec2b96cd2e6a930057c82cf6402ac 100644 (file)
@@ -298,7 +298,7 @@ class Conference(Model):
     readers         = models.ManyToManyField(User, related_name="conference", verbose_name=_('readers'),
                                         blank=True, null=True)
     status          = models.IntegerField(_('status'), choices=STATUS_CHOICES, default=2)
-    web_class_group = models.ForeignKey('WebClassGroup', related_name='conferences', verbose_name=_('web class group'),
+    class_group     = models.ForeignKey('ClassGroup', related_name='conferences', verbose_name=_('class group'),
                              blank=True, null=True, on_delete=models.SET_NULL)
 
     @property
@@ -362,7 +362,7 @@ class Conference(Model):
                 'streams': [],
                 'date_begin': self.date_begin.strftime('%Y %m %d %H %M %S') if self.date_begin else 'None',
                 'date_end': self.date_end.strftime('%Y %m %d %H %M %S') if self.date_end else 'None',
-                'web_class_group': self.web_class_group.name if self.web_class_group else 'None',
+                'class_group': self.class_group.name if self.class_group else 'None',
                  }
 
         if self.room:
@@ -417,9 +417,9 @@ class Conference(Model):
             self.room, c = Room.objects.get_or_create(name=data['room'],
                                                    organization=organization)
 
-        if 'web_class_group' in data.keys():
-            if data['web_class_group'] != 'None':
-                self.web_class_group = WebClassGroup.objet.get(name=data['web_class_group'])
+        if 'class_group' in data.keys():
+            if data['class_group'] != 'None':
+                self.class_group = ClassGroup.objet.get(name=data['class_group'])
 
 
     class Meta(MetaCore):
index 650ec574ee765acf788db3d2d9560e9ed517872c..da47ceb53190b4209d1880b2b4eea3c62d33319e 100644 (file)
@@ -55,15 +55,15 @@ class IEJ(Model):
         ordering = ['name']
 
 
-class WebClassGroup(models.Model):
+class ClassGroup(models.Model):
 
     name = models.CharField(_('name'), max_length=255)
-    iejs = models.ManyToManyField('IEJ', related_name="web_class_group", verbose_name=_('IEJ'),
+    iejs = models.ManyToManyField('IEJ', related_name="class_groups", verbose_name=_('IEJ'),
                                         blank=True, null=True)
 
     class Meta(MetaCore):
-        verbose_name = _('web class group')
-        verbose_name_plural = _('web class group')
+        verbose_name = _('class group')
+        verbose_name_plural = _('class group')
         ordering = ['name']
 
     def to_json_dict(self):