Changeset 529 for WAeUP_SRP

Timestamp:

18 Sep 2006, 07:26:56 (18 years ago)

Author:

joachim

Message:

fixed #14 + #15'

File:

• WAeUP_SRP/trunk/Academics.py (modified) (2 diffs)

WAeUP_SRP/trunk/Academics.py

@@ -555 +555 @@
                 for certificate in department.certificates.objectValues():
                     certificate_d = certificate.getContent()
-                    di['code'] = certificate_d.get('code',None)
-                    di['title'] = certificate_d.get('title',None)
-                    di['category'] = certificate_d.get('category',None)
-                    di['admin_status'] = certificate_d.get('admin_status',None)
-                    di['end_level'] = certificate_d.get('end_level',None)
-                    di['m_prefix'] = certificate_d.get('m_prefix',None)
-                    di['max_elect'] = certificate_d.get('max_elect',None)
-                    di['max_load'] = certificate_d.get('max_load',None)
-                    di['max_pass'] = certificate_d.get('max_pass',None)
-                    di['n_core'] = certificate_d.get('n_core',None)
-                    di['nr_years'] = certificate_d.get('nr_years',None)
-                    di['original_code'] = certificate_d.get('original_code',None)
-                    di['probation_credits'] = certificate_d.get('probation_credits',None)
-                    di['promotion_credits'] = certificate_d.get('promotion_credits',None)
-                    di['start_level'] = certificate_d.get('start_level',None)
+                    di['code'] = getattr(certificate_d,'code',None)
+                    di['title'] = getattr(certificate_d,'title',None)
+                    di['category'] = getattr(certificate_d,'category',None)
+                    di['admin_status'] = getattr(certificate_d,'admin_status',None)
+                    di['end_level'] = getattr(certificate_d,'end_level',None)
+                    di['m_prefix'] = getattr(certificate_d,'m_prefix',None)
+                    di['max_elect'] = getattr(certificate_d,'max_elect',None)
+                    di['max_load'] = getattr(certificate_d,'max_load',None)
+                    di['max_pass'] = getattr(certificate_d,'max_pass',None)
+                    di['n_core'] = getattr(certificate_d,'n_core',None)
+                    di['nr_years'] = getattr(certificate_d,'nr_years',None)
+                    di['original_code'] = getattr(certificate_d,'original_code',None)
+                    di['probation_credits'] = getattr(certificate_d,'probation_credits',None)
+                    di['promotion_credits'] = getattr(certificate_d,'promotion_credits',None)
+                    di['start_level'] = getattr(certificate_d,'start_level',None)
                     di['code'] = di['code'] or certificate.id
                     di['review_state'] = self.portal_workflow.getInfoFor(certificate,'review_state','no_state')
@@ -616 +616 @@
                                     course_d = course.getContent()
                                     di['code'] = course_d.get('code',None)
-                                    di['core_or_elective'] = course_d.get('core_or_elective',None)
+                                    di['core_or_elective'] = getattr(course_d,'core_or_elective',None)
                                     di['code'] = di['code'] or course.id
                                     di['review_state'] = self.portal_workflow.getInfoFor(course,'review_state','no_state')