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

Cleaned up default type formatters

parent 2078a297
from mongoengine.base import BaseList from mongoengine.base import BaseList
from flask.ext.admin.model.typefmt import DEFAULT_FORMATTERS from flask.ext.admin.model.typefmt import BASE_FORMATTERS, list_formatter
def list_formatter(values): DEFAULT_FORMATTERS = BASE_FORMATTERS.copy()
"""
Return string with comma separated values
:param values:
Value to check
"""
return u', '.join(unicode(v) for v in values)
DEFAULT_FORMATTERS = DEFAULT_FORMATTERS.copy()
DEFAULT_FORMATTERS.update({ DEFAULT_FORMATTERS.update({
BaseList: list_formatter BaseList: list_formatter
}) })
from flask.ext.admin.model.typefmt import DEFAULT_FORMATTERS, list_formatter from flask.ext.admin.model.typefmt import BASE_FORMATTERS, list_formatter
from sqlalchemy.orm.collections import InstrumentedList from sqlalchemy.orm.collections import InstrumentedList
DEFAULT_FORMATTERS = DEFAULT_FORMATTERS.copy() DEFAULT_FORMATTERS = BASE_FORMATTERS.copy()
DEFAULT_FORMATTERS.update({ DEFAULT_FORMATTERS.update({
InstrumentedList: list_formatter InstrumentedList: list_formatter
}) })
...@@ -109,7 +109,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -109,7 +109,7 @@ class BaseModelView(BaseView, ActionsMixin):
from flask.ext.admin import typefmt from flask.ext.admin import typefmt
MY_DEFAULT_FORMATTERS = dict(typefmt.DEFAULT_FORMATTERS).extend({ MY_DEFAULT_FORMATTERS = dict(typefmt.BASE_FORMATTERS).extend({
type(None): typefmt.null_formatter type(None): typefmt.null_formatter
}) })
...@@ -335,7 +335,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -335,7 +335,7 @@ class BaseModelView(BaseView, ActionsMixin):
# Type formatters # Type formatters
if self.column_type_formatters is None: if self.column_type_formatters is None:
self.column_type_formatters = dict(typefmt.DEFAULT_FORMATTERS) self.column_type_formatters = dict(typefmt.BASE_FORMATTERS)
if self.column_descriptions is None: if self.column_descriptions is None:
self.column_descriptions = dict() self.column_descriptions = dict()
......
...@@ -41,7 +41,7 @@ def list_formatter(values): ...@@ -41,7 +41,7 @@ def list_formatter(values):
return u', '.join(unicode(v) for v in values) return u', '.join(unicode(v) for v in values)
DEFAULT_FORMATTERS = { BASE_FORMATTERS = {
type(None): empty_formatter, type(None): empty_formatter,
bool: bool_formatter, bool: bool_formatter,
list: list_formatter, list: list_formatter,
......
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