From: Guillaume Pellerin Date: Thu, 26 Dec 2013 15:18:45 +0000 (+0100) Subject: add date to media unicode X-Git-Tag: 2.8.1-pro~388 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=caa1cf3066864b3bf0c542d878367d579beec12e;p=teleforma.git add date to media unicode --- diff --git a/teleforma/management/commands/teleforma-import-seminar-media.py b/teleforma/management/commands/teleforma-import-seminar-media.py index dfa53dcc..ed358524 100644 --- a/teleforma/management/commands/teleforma-import-seminar-media.py +++ b/teleforma/management/commands/teleforma-import-seminar-media.py @@ -24,7 +24,7 @@ class Logger: class Command(BaseCommand): - help = "Import seminars from the MEDIA_ROOT directory for a special period.name" + help = "Import seminars from a media directory for a special period.name" admin_email = 'webmaster@parisson.com' args = 'organization period_name log_file media_dir' spacer = '_-_' diff --git a/teleforma/models/core.py b/teleforma/models/core.py index caa8249e..28c55a66 100755 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -454,10 +454,10 @@ class Media(MediaBase): strings = [] if self.period: strings.append(self.period.name) - if self.course and self.course_type: - strings.append(self.course.code + ' ' + self.course_type.name) - elif self.course: + if self.course and : strings.append(self.course.code) + elif self.course_type: + strings.append(self.course_type.name) elif self.item.title: strings.append(self.item.title) else: @@ -465,6 +465,7 @@ class Media(MediaBase): if self.rank: strings.append(str(self.rank)) + strings.append(self.date_added) strings.append(self.mime_type) return ' - '.join(strings)