Commit 5ef405ca authored by Serge S. Koval's avatar Serge S. Koval

Fixed choices support

parent 5e5b5736
...@@ -205,8 +205,10 @@ class AdminModelConverter(ModelConverterBase): ...@@ -205,8 +205,10 @@ class AdminModelConverter(ModelConverterBase):
return override(**kwargs) return override(**kwargs)
# Check choices # Check choices
if mapper.class_ == self.view.model and self.view.form_choices: form_choices = getattr(self.view, 'form_choices', None)
choices = self.view.form_choices.get(column.key)
if mapper.class_ == self.view.model and form_choices:
choices = form_choices.get(column.key)
if choices: if choices:
return Select2Field( return Select2Field(
choices=choices, choices=choices,
...@@ -221,7 +223,7 @@ class AdminModelConverter(ModelConverterBase): ...@@ -221,7 +223,7 @@ class AdminModelConverter(ModelConverterBase):
return None return None
return converter(model=model, mapper=mapper, prop=prop, return converter(model=model, mapper=mapper, prop=prop,
column=column, field_args=kwargs) column=column, field_args=kwargs)
return None return None
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment