Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/applicant.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/applicants/applicant.py (modified) (4 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/applicant.py

@@ -27 +27 @@
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.interface import implementedBy
-from zope.schema.interfaces import RequiredMissing, ConstraintNotSatisfied
+from zope.schema.interfaces import RequiredMissing
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from waeup.kofa.image import KofaImageFile
@@ -36 +36 @@
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.vocabularies import RegNumNotInSource
-from waeup.kofa.students.studycourse import StudentStudyCourse
 from waeup.kofa.utils.helpers import attrs_to_fields
 from waeup.kofa.applicants.interfaces import IApplicant, IApplicantEdit
@@ -119 +118 @@
         if self.course_admitted is None:
             return False, _('No course admitted provided.')
-        # Set student attributes
+        # Add student object
         try:
             for name in self.create_names:
                 setattr(student, name, getattr(self, name, None))
         except RequiredMissing, err:
-            return False, 'RequiredMissing: %s' % err
-        except:
-            return False, 'Error: %s' % err
-        # Finally prove if the certificate still exists
-        try:
-            StudentStudyCourse().certificate = self.course_admitted
-        except ConstraintNotSatisfied, err:
-            return False, 'ConstraintNotSatisfied: %s' % self.course_admitted.code
-        # Add student
+            return False, _('RequiredMissing: %s' % err)
         site = grok.getSite()
         site['students'].addStudent(student)
-        # Save student_id
         self.student_id = student.student_id
-        # Fire transitions
         IWorkflowInfo(self).fireTransition('create')
         IWorkflowInfo(student).fireTransition('admit')
+
         # Set password
         IUserAccount(student).setPassword(self.application_number)
+
         # Save the certificate and set session attributes
         student['studycourse'].certificate = self.course_admitted
@@ -151 +142 @@
         # Update the catalog
         notify(grok.ObjectModifiedEvent(student))
+
         # Save application slip
         self._createApplicationPDF(student, view=view)