From: yomguy <yomguy@parisson.com>
Date: Mon, 5 Nov 2012 15:30:08 +0000 (+0100)
Subject: fix json department
X-Git-Tag: 0.9-probarreau~330
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9b96183b04249246750ebc548502085bda953386;p=teleforma.git

fix json department
---

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 6bdd3122..f2f0e2ce 100644
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -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: