Commit adeaf2ca authored by Serge S. Koval's avatar Serge S. Koval

Merge pull request #460 from iurisilvio/column_and_type_formatters

Apply `type_formatter` after `column_formatter` in list view.
parents 7a7c438d 02439308
...@@ -1058,9 +1058,9 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -1058,9 +1058,9 @@ class BaseModelView(BaseView, ActionsMixin):
""" """
column_fmt = self.column_formatters.get(name) column_fmt = self.column_formatters.get(name)
if column_fmt is not None: if column_fmt is not None:
return column_fmt(self, context, model, name) value = column_fmt(self, context, model, name)
else:
value = self._get_field_value(model, name) value = self._get_field_value(model, name)
choices_map = self._column_choices_map.get(name, {}) choices_map = self._column_choices_map.get(name, {})
if choices_map: if choices_map:
......
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