Skip to content

F
flask-admin
Commit 8b1e0fc2 authored by Serge S. Koval's avatar Serge S. Koval
Browse files
Options

Merge branch 'master' of github.com:mrjoes/flask-admin

parents 8142064c adeaf2ca
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
flask_admin/model/base.py
View file @ 8b1e0fc2
...@@ -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