Changeset 7434 for main/waeup.sirp/trunk

Timestamp:

22 Dec 2011, 07:39:00 (13 years ago)

Author:

Henrik Bettermann

Message:

The result list instance has to be created before concatenating with [curr_course,]. Now all tests pass.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/applicants

Files:

• tests/test_browser.py (modified) (1 diff)
• vocabularies.py (modified) (2 diffs)

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

@@ -738 +738 @@
         self.assertTrue(
             'Unnamed Certificate' in self.browser.contents)
+        # Even if we add a new certificate the previous (removed)
+        # certificate is shown
+        certificate = createObject('waeup.Certificate')
+        certificate.code = 'CERT2'
+        certificate.title = 'New Certificate'
+        certificate.application_category = 'basic'
+        self.app['faculties']['fac1']['dep1'].certificates.addCertificate(
+            certificate)
+        self.browser.open(self.edit_path)
+        self.assertTrue(
+            '<option selected="selected" value="CERT1">' in self.browser.contents)
 
 class ApplicantRegisterTests(ApplicantsFullSetup):

main/waeup.sirp/trunk/src/waeup/sirp/applicants/vocabularies.py

@@ -58 +58 @@
         result = catalog.searchResults(
             application_category=(appcat,appcat))
+        result = sorted(result, key=lambda value: value.code)
         curr_course = context.course1
         if curr_course is not None and curr_course not in result:
@@ -63 +64 @@
             # (any more)
             result = [curr_course,] + result
-        return sorted(result, key=lambda value: value.code)
+        return result