Changeset 4512 for waeup/branches/ulif-rewrite

Timestamp:

1 Aug 2009, 08:35:43 (15 years ago)

Author:

uli

Message:

Make vocabulary support tokens.

File:

• waeup/branches/ulif-rewrite/src/waeup/interfaces.py (modified) (2 diffs)

waeup/branches/ulif-rewrite/src/waeup/interfaces.py

@@ -3 +3 @@
 from zope.interface import Interface, Attribute
 from zope import schema
-from zope.schema.vocabulary import SimpleVocabulary
+from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 from waeup.permissions import RoleSource
+
+def SimpleWAeUPVocabulary(*terms):
+    """A well-buildt vocabulary provides terms with a value, token and
+       title for each term
+    """
+    return SimpleVocabulary([
+            SimpleTerm(value, value, title) for title, value in terms])
 
 class IWAeUPObject(Interface):
@@ -157 +164 @@
         title = u'Semester/Term',
         default = 0,
-        vocabulary = SimpleVocabulary.fromItems([
-                ('N/A', 0), ('First Semester', 1),
-                ('Second Semester', 2), ('Combined', 3),]),
+        vocabulary = SimpleWAeUPVocabulary(
+            ('N/A', 0), ('First Semester', 1),
+            ('Second Semester', 2), ('Combined', 3)),
         required = True,
         )