Changeset 8615

Timestamp:

3 Jun 2012, 13:33:47 (13 years ago)

Author:

uli

Message:

Check application_category of cert 'course1' when batching.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/applicants/batching.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/batching.py

@@ -154 +154 @@
 
     def getParent(self, row, site):
+        result = None
         if self.getLocator(row) == 'container_code':
-            return site['applicants'].get(row['container_code'], None)
-        if self.getLocator(row) == 'reg_number':
+            result = site['applicants'].get(row['container_code'], None)
+        elif self.getLocator(row) == 'reg_number':
             reg_number = row['reg_number']
             cat = queryUtility(ICatalog, name='applicants_catalog')
@@ -162 +163 @@
                 cat.searchResults(reg_number=(reg_number, reg_number)))
             if results:
-                return results[0].__parent__
-        if self.getLocator(row) == 'applicant_id':
+                result = results[0].__parent__
+        elif self.getLocator(row) == 'applicant_id':
             applicant_id = row['applicant_id']
             cat = queryUtility(ICatalog, name='applicants_catalog')
@@ -169 +170 @@
                 cat.searchResults(applicant_id=(applicant_id, applicant_id)))
             if results:
-                return results[0].__parent__
-        return None
+                result = results[0].__parent__
+        return result
 
     def parentsExist(self, row, site):
@@ -301 +302 @@
         errs, inv_errs, conv_dict =  converter.fromStringDict(
             row, self.factory_name, mode=mode)
+        cert = conv_dict.get('course1', None)
+        if cert is not None and (mode in ('create', 'update')):
+            # course1 application category must match container's.  We
+            # could move that check into addApplicant, as it is
+            # expensive.
+            #
+            # XXX: getSite() should be avoided here.
+            parent = self.getParent(row, grok.getSite())
+            if cert.application_category != parent.application_category:
+                errs.append(('course1', 'wrong application category'))
         if row.has_key('state') and \
             not row['state'] in IMPORTABLE_STATES: