Index: /WAeUP_SRP/base/WAeUPTables.py
===================================================================
--- /WAeUP_SRP/base/WAeUPTables.py	(revision 3347)
+++ /WAeUP_SRP/base/WAeUPTables.py	(revision 3348)
@@ -912,4 +912,5 @@
             ld['department'] = cb_path[-3]
             ld['end_level'] = getattr(certificate_doc,'end_level','999')
+            ld['study_mode'] = getattr(certificate_doc,'study_mode','')
             d[cb.getId] = ld
         return d
@@ -920,6 +921,6 @@
         if doc is None:
             return None
-        if cached_data.has_key(doc.study_course):
-            return cached_data[doc.study_course]['department']
+        if self._v_certificates.has_key(doc.study_course):
+            return self._v_certificates[doc.study_course]['department']
         certificate_res = self.portal_catalog(id = doc.study_course)
         if len(certificate_res) != 1:
@@ -931,6 +932,6 @@
         if doc is None:
             return None
-        if cached_data.has_key(doc.study_course):
-            return cached_data[doc.study_course]['faculty']
+        if self._v_certificates.has_key(doc.study_course):
+            return self._v_certificates[doc.study_course]['faculty']
         certificate_res = self.portal_catalog(id = doc.study_course)
         if len(certificate_res) != 1:
@@ -942,6 +943,6 @@
         if doc is None:
             return None
-        if cached_data.has_key(doc.study_course):
-            return cached_data[doc.study_course]['end_level']
+        if self._v_certificates.has_key(doc.study_course):
+            return self._v_certificates[doc.study_course]['end_level']
         certificate_res = self.portal_catalog(id = doc.study_course)
         if len(certificate_res) != 1:
@@ -1178,4 +1179,7 @@
         if event_type not in ('sys_modify_object'):
             return
+        if pt == 'StudentStudyCourse' and mt == 'CPS Proxy Folder':
+            if not hasattr(self,'_v_certificates'):
+                self._v_certificates = self.fill_certificates_dict()
         if mt == 'CPS Proxy Folder':
             return
