]> git.parisson.com Git - teleforma.git/commitdiff
fix json department
authoryomguy <yomguy@parisson.com>
Mon, 5 Nov 2012 15:30:08 +0000 (16:30 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 5 Nov 2012 15:30:08 +0000 (16:30 +0100)
teleforma/models/core.py

index 6bdd31223616c0ed74eba2928de6c42a111b3f07..f2f0e2cebbbfb655141432a4126aa9a8427bf81d 100644 (file)
@@ -265,10 +265,14 @@ class Conference(Model):
         return dict
 
     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, 'department': self.department,
+        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,
                 'session': self.session,
+                'comment': self.comment,
                 'streams': [] }
 
         if self.room: