Changeset 85:6b45c4fa6e0c

Timestamp:

Jan 5, 2010, 3:36:45 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Reposition assignment for the Data Form field label, so it's not overwritten.

Author: ralphm.
Fixes #60.

Location:

wokkel

Files:

• data_form.py (modified) (2 diffs)
• test/test_data_form.py (modified) (1 diff)

wokkel/data_form.py

@@ -131 +131 @@
         self.fieldType = fieldType
         self.var = var
+
         if value is not None:
             self.value = value
         else:
             self.values = values or []
+
+        self.label = label
 
         try:
@@ -142 +145 @@
             self.options = options or []
 
-        self.label = label
         self.desc = desc
         self.required = required

wokkel/test/test_data_form.py

@@ -102 +102 @@
         self.assertEqual('text-single', field.fieldType)
         self.assertEqual('test', field.var)
+
+
+    def test_labelAndOptions(self):
+        """
+        The label should be set, even if there are options with labels as dict.
+        """
+        field = data_form.Field(label='test',
+                                options={'test2': 'test 2', 'test3': 'test 3'})
+        self.assertEqual('test', field.label)