Changeset 15459 for main/waeup.aaue/trunk

Timestamp:

18 Jun 2019, 05:47:35 (6 years ago)

Author:

Henrik Bettermann

Message:

course1 works only on manage pages. On edit pages course1 input is missing
and no Invalid exception is raised.
NoInputData?: NoInputD...course1'
Therefore, we check and compare course1 on CustomApplicantEditFormPage?.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/applicants

Files:

• browser.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

@@ -547 +547 @@
             self.emit_lock_message()
             return
+        if getattr(
+            self.context.course1, 'code', 'nocourse') == self.request.form.get(
+            'form.course2', None):
+            self.flash(_('2nd choice course must differ from 1st choice course.'),
+                       type='danger')
+            self.redirect(self.url(self.context))
+            return
+        if getattr(
+            self.context.course1, 'code', 'nocourse') == self.request.form.get(
+            'form.course3', None):
+            self.flash(_('3rd choice course must differ from 1st choice course.'),
+                       type='danger')
+            self.redirect(self.url(self.context))
+            return
         super(CustomApplicantEditFormPage, self).update()
         upload_stateresult = self.request.form.get('form.stateresult', None)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

@@ -875 +875 @@
         )
 
+    # course1 works only on manage pages. On edit pages course1 input is missing
+    # and no Invalid exception is raised.
+    # NoInputData: NoInputD...course1'
+    # Therefore, we check and compare course1 on CustomApplicantEditFormPage.
+    @invariant
+    def course_choice(applicant):
+        if applicant.course2 == applicant.course3:
+            raise Invalid(_("3rd choice course must differ from 2nd choice course."))
+
 #ICustomUGApplicantEdit['programme_type'].order = ICustomUGApplicant[
 #    'programme_type'].order