Changeset 13280 for main/waeup.kofa/trunk/src/waeup

Timestamp:

2 Oct 2015, 15:35:29 (9 years ago)

Author:

Henrik Bettermann

Message:

Disable duplication checking, see Uniben #1011.

Location:

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

Files:

• applicants/browser.py (modified) (1 diff)
• applicants/interfaces.py (modified) (1 diff)
• applicants/tests/test_browser.py (modified) (1 diff)
• hostels/interfaces.py (modified) (2 diffs)

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

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

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

@@ -408 +408 @@
         source = AppCatCertificateSource(),
         required = False,
+        description = _('Should be different from 1st choice.')
         )
 

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

@@ -1119 +1119 @@
         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
-
     def test_final_submit(self):
         # Make sure that a correctly filled form with passport picture

main/waeup.kofa/trunk/src/waeup/kofa/hostels/interfaces.py

@@ -38 +38 @@
         title = _(u'Hostel Allocation Start Date'),
         required = False,
-        description = _('Example:') + u'2011-12-01 18:30:00+01:00',
+        description = _('Example: ') + u'2011-12-01 18:30:00+01:00',
         )
 
@@ -44 +44 @@
         title = _(u'Hostel Allocation Closing Date'),
         required = False,
-        description = _('Example:') + u'2011-12-31 23:59:59+01:00',
+        description = _('Example: ') + u'2011-12-31 23:59:59+01:00',
         )