From 563e51be6c7c8480b232e205608418a384a3c0c2 Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 8 Feb 2013 15:46:03 +0100 Subject: [PATCH] cleanup course_type --- teleforma/admin.py | 1 + teleforma/models/core.py | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/teleforma/admin.py b/teleforma/admin.py index 18968214..b13df9dc 100644 --- a/teleforma/admin.py +++ b/teleforma/admin.py @@ -92,6 +92,7 @@ admin.site.register(CourseType) admin.site.register(CourseDomain, CourseDomainAdmin) admin.site.register(Conference, ConferenceAdmin) # admin.site.register(IEJ) +admin.site.register(Professor, ProfessorAdmin) admin.site.register(Seminar, SeminarAdmin) admin.site.register(Question) diff --git a/teleforma/models/core.py b/teleforma/models/core.py index 96e1bbea..7a66f684 100755 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -495,7 +495,7 @@ class Conference(Displayable): def slug_streaming(self): slug = '-'.join([self.course.department.slug, self.course.slug, - self.course_type.name.lower()]) + ]) return slug def get_absolute_url(self): @@ -504,13 +504,13 @@ class Conference(Displayable): def __unicode__(self): if self.professor: list = [self.course.department.name, self.course.title, - self.course_type.name, self.session, + self.session, self.professor.user.first_name, self.professor.user.last_name, str(self.date_begin)] else: list = [self.course.department.name, self.course.title, - self.course_type.name, self.session, + self.session, str(self.date_begin)] return ' - '.join(list) @@ -533,7 +533,6 @@ class Conference(Displayable): def to_json_dict(self): data = {'id': self.public_id, 'course_code': self.course.code, - 'course_type': self.course_type.name, 'professor_id': self.professor.user.username, 'period': self.period.name, 'department': self.department.name, -- 2.39.5