cleanup course_type

diff --git a/teleforma/admin.py b/teleforma/admin.py
index 18968214b8a6ad39e5b2af0da8a31d0f423731a6..b13df9dc36d6c73ea8c313cc998aa9d6ff2ff857 100644 (file)
--- 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 96e1bbea42fa7f5d20e86fd4e780eb107f69e659..7a66f6844a83b7a01d9dba841aaa4a5377c7707a 100755 (executable)
--- 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,