Changeset 7915

Timestamp:

19 Mar 2012, 04:21:47 (13 years ago)

Author:

uli

Message:

Move CertificateSource? to university package. I think this is the right place.

Location:

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

Files:

• applicants/interfaces.py (modified) (1 diff)
• students/interfaces.py (modified) (1 diff)
• students/vocabularies.py (modified) (1 diff)
• university/vocabularies.py (modified) (1 diff)

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

@@ -34 +34 @@
 from waeup.kofa.schoolgrades import ResultEntryField
 from waeup.kofa.students.vocabularies import (
-    lgas_vocab, CertificateSource, GenderSource)
+    lgas_vocab, GenderSource)
 from waeup.kofa.university.vocabularies import (
-    course_levels, AppCatSource)
+    course_levels, AppCatSource, CertificateSource)
 
 #: Maximum upload size for applicant passport photographs (in bytes)

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

@@ -25 +25 @@
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.schema import TextLineChoice
-from waeup.kofa.university.vocabularies import CourseSource, StudyModeSource
 from waeup.kofa.students.vocabularies import (
-  CertificateSource, StudyLevelSource,
-  contextual_reg_num_source, contextual_mat_num_source,
-  GenderSource, nats_vocab,
-  )
+    StudyLevelSource, contextual_reg_num_source, contextual_mat_num_source,
+    GenderSource, nats_vocab,
+    )
 from waeup.kofa.payments.interfaces import IPaymentsContainer, IOnlinePayment
+from waeup.kofa.university.vocabularies import (
+    CourseSource, StudyModeSource, CertificateSource)
 
 # VerdictSource can't be placed into the vocabularies module because it

main/waeup.kofa/trunk/src/waeup/kofa/students/vocabularies.py

@@ -99 +99 @@
         return title
 
-class CertificateSource(BasicContextualSourceFactory):
-    """A certificate source delivers all certificates provided
-    in the portal.
-    """
-    def getValues(self, context):
-        catalog = getUtility(ICatalog, name='certificates_catalog')
-        return sorted(list(
-                catalog.searchResults(
-                    code=('', 'z*'))),
-                    key=lambda value: value.code)
-
-    def getToken(self, context, value):
-        return value.code
-
-    def getTitle(self, context, value):
-        return "%s - %s" % (value.code, value.title[:64])
-
-
 class GenderSource(BasicSourceFactory):
     """A gender source delivers basically a mapping

main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py

@@ -121 +121 @@
     def getTitle(self, value):
         return "%s - %s" % (value.code, value.title[:64])
+
+class CertificateSource(BasicContextualSourceFactory):
+    """A certificate source delivers all certificates provided
+    in the portal.
+    """
+    def getValues(self, context):
+        catalog = getUtility(ICatalog, name='certificates_catalog')
+        return sorted(list(
+                catalog.searchResults(
+                    code=('', 'z*'))),
+                    key=lambda value: value.code)
+
+    def getToken(self, context, value):
+        return value.code
+
+    def getTitle(self, context, value):
+        return "%s - %s" % (value.code, value.title[:64])