Christian Klein avatar Christian Klein committed 63f90ce

User defined choices in ModelConverter

Do not autogenerate choices if field_args contains choices for a SelectField.

Use parameter 'choices' in model_forms if it was

Comments (0)

Files changed (1)

wtforms/ext/appengine/db.py

             kwargs['validators'].append(validators.required())
 
         if prop.choices:
-            # Use choices in a select field.
-            kwargs['choices'] = [(v, v) for v in prop.choices]
+            # Use choices in a select field if it was not provided in field_args
+            if not 'choices' in kwargs:
+                kwargs['choices'] = [(v, v) for v in prop.choices]
             return f.SelectField(**kwargs)
         else:
             converter = self.converters.get(prop_type_name, None)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.