Changeset 2313

Timestamp:

4 Oct 2007, 20:59:49 (17 years ago)

Author:

joachim

Message:

fix mixing of certificates and courses

File:

• WAeUP_SRP/base/WAeUPTool.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -1003 +1003 @@
         if getattr(self,'_v_departments',None) is None:
             res = self.portal_catalog(portal_type = "Department")
-            self._v_departments = {}
+            self._v_department_courses = {}
             for d in res:
-                self._v_departments[d.getId] = getattr(d.getObject(),"courses",None)
+                self._v_department_courses[d.getId] = getattr(d.getObject(),"courses",None)
         did = mapping['department_code']
-        d = self._v_departments.get(did,None)
+        d = self._v_department_courses.get(did,None)
         if d is None:
             return '', "No Department with ID: %s" % did
         course_id = mapping.get('code')
         if course_id in self._v_course_list:
-            return '', "Duplicate Department ID: %s" % did
+            return '', "Duplicate Course ID: %s" % did
         c = getattr(d,course_id,None)
         if c is not None:
-            return '', "Duplicate Department ID: %s" % did
+            return '', "Duplicate Course ID: %s" % did
         try:
             d.invokeFactory('Course', course_id)
@@ -1042 +1042 @@
         if getattr(self,'_v_certificate_list',None) is None:
             self._v_certificate_list = []
-        if getattr(self,'_v_departments',None) is None:
+        if getattr(self,'_v_department_certificates',None) is None:
             res = self.portal_catalog(portal_type = "Department")
-            self._v_departments = {}
+            self._v_department_certificates = {}
             for d in res:
-                self._v_departments[d.getId] = getattr(d.getObject(),"certificates",None)
+                self._v_department_certificates[d.getId] = getattr(d.getObject(),"certificates",None)
         did = mapping['department_code']
-        d = self._v_departments.get(did,None)
+        d = self._v_department_certificates.get(did,None)
         if d is None:
             return '', "No Department with ID: %s" % did
         certificate_id = mapping.get('code')
         if certificate_id in self._v_certificate_list:
-            return '', "Duplicate Department ID: %s" % did
+            return '', "Duplicate Certificate ID: %s" % did
         c = getattr(d,certificate_id,None)
         if c is not None:
-            return '', "Duplicate Department ID: %s" % did
+            return '', "Duplicate Certificate ID: %s" % did
         try:
             d.invokeFactory('Certificate', certificate_id)