Merge pull request #3 from typecode/field-fixes

Fixes for dropdown and checkboxes fields

Author: fredevery

wagtail_advanced_form_builder/forms/advanced_form_builder.py

@@ -36,7 +36,7 @@ def create_html_field(self, field, options):
 
     def create_dropdown_field(self, field, options):
         options['choices'] = list(map(
-            lambda x: (x.strip(), x.strip()),
+            lambda x: (x.get('value', '').strip(), x.get('value', '').strip()),
             field.choices
         ))
         if field.empty_label:
@@ -46,11 +46,12 @@ def create_dropdown_field(self, field, options):
 
     def create_checkboxes_field(self, field, options):
         options['choices'] = list(map(
-            lambda x: (x.strip(), x.strip()),
+            lambda x: (x.get('value', '').strip(), x.get('value', '').strip()),
             field.choices
         ))
+
         options['initial'] = list(map(
-            lambda x: (x.strip(), x.strip()),
+            lambda x: x.get('value', '').strip(),
             field.default_value
         ))