Changeset 10210 for main/waeup.kofa/trunk

Timestamp:

23 May 2013, 20:55:30 (12 years ago)

Author:

Henrik Bettermann

Message:

Make sure that that 1st and 2nd choice course of study are different.

Location:

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

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

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

@@ -993 +993 @@
             # Error during image upload. Ignore other values.
             return
+        if data['course1'] == data['course2']:
+            self.flash(_('1st and 2nd choice must be different.'))
+            return
         self.applyData(self.context, **data)
-        self.flash('Form has been saved.')
+        self.flash(_('Form has been saved.'))
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -863 +863 @@
             % (self.applicant.applicant_id, payment.p_id)
             in logcontent)
+        return
+
+    def test_duplicate_choice(self):
+        # Make sure that that 1st and 2nd choice are different
+        self.login()
+        self.browser.open(self.edit_path)
+        self.fill_correct_values() # fill other fields with correct values
+        self.browser.getControl(name="form.course2").value = ['CERT1']
+        self.browser.getControl("Save").click()
+        self.assertTrue(
+            '1st and 2nd choice must be different' in self.browser.contents)
+        self.browser.getControl(name="form.course2").value = []
+        self.browser.getControl("Save").click()
+        self.assertTrue('Form has been saved' in self.browser.contents)
         return