From: Guillaume Pellerin Date: Mon, 13 Jul 2015 10:50:57 +0000 (+0200) Subject: Merge branch 'dev' into feature/scores X-Git-Tag: 1.1~232^2~3 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9ae469aa5d40102c62489f3781f52c8b460127f2;p=teleforma.git Merge branch 'dev' into feature/scores Conflicts: teleforma/models/core.py teleforma/templates/postman/view.html --- 9ae469aa5d40102c62489f3781f52c8b460127f2 diff --cc teleforma/models/core.py index 1b6fa82b,2fbf489f..0a52f806 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@@ -151,19 -151,18 +151,18 @@@ class CourseType(Model) class Course(Model): - department = ForeignKey('Department', related_name='course', + department = models.ForeignKey('Department', related_name='course', verbose_name=_('department')) - title = CharField(_('title'), max_length=255) - description = CharField(_('description'), max_length=255, blank=True) - code = CharField(_('code'), max_length=255) - title_tweeter = CharField(_('tweeter title'), max_length=255) - date_modified = DateTimeField(_('date modified'), auto_now=True, null=True) - number = IntegerField(_('number'), blank=True, null=True) - synthesis_note = BooleanField(_('synthesis note')) - obligation = BooleanField(_('obligations')) - magistral = BooleanField(_('magistral')) + title = models.CharField(_('title'), max_length=255) + description = models.CharField(_('description'), max_length=255, blank=True) + code = models.CharField(_('code'), max_length=255) + title_tweeter = models.CharField(_('tweeter title'), max_length=255) + date_modified = models.DateTimeField(_('date modified'), auto_now=True, null=True) + number = models.IntegerField(_('number'), blank=True, null=True) + synthesis_note = models.BooleanField(_('synthesis note')) + obligation = models.BooleanField(_('obligations')) + magistral = models.BooleanField(_('magistral')) - def __unicode__(self): return self.title