Commit 2078a297 authored by Serge S. Koval's avatar Serge S. Koval

Merge pull request #131 from ArtemSerga/3

#3 - Add SQAlchemy specific column_type_formatter
parents 73b28026 ac1c5202
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 DEFAULT_FORMATTERS
def mongoengine_list_formatter(values): def list_formatter(values):
""" """
Return string with comma separated values Return string with comma separated values
...@@ -13,7 +12,7 @@ def mongoengine_list_formatter(values): ...@@ -13,7 +12,7 @@ def mongoengine_list_formatter(values):
return u', '.join(unicode(v) for v in values) return u', '.join(unicode(v) for v in values)
MONGOENGINE_FORMATTERS = dict(DEFAULT_FORMATTERS) DEFAULT_FORMATTERS = DEFAULT_FORMATTERS.copy()
MONGOENGINE_FORMATTERS.update({ DEFAULT_FORMATTERS.update({
BaseList: mongoengine_list_formatter BaseList: list_formatter
}) })
...@@ -12,7 +12,7 @@ from flask.ext.admin.actions import action ...@@ -12,7 +12,7 @@ from flask.ext.admin.actions import action
from flask.ext.admin.form import BaseForm from flask.ext.admin.form import BaseForm
from .filters import FilterConverter, BaseMongoEngineFilter from .filters import FilterConverter, BaseMongoEngineFilter
from .form import model_form, CustomModelConverter from .form import model_form, CustomModelConverter
from .typefmt import MONGOENGINE_FORMATTERS from .typefmt import DEFAULT_FORMATTERS
from .tools import parse_like_term from .tools import parse_like_term
...@@ -76,7 +76,7 @@ class ModelView(BaseModelView): ...@@ -76,7 +76,7 @@ class ModelView(BaseModelView):
Override this attribute to use non-default converter. Override this attribute to use non-default converter.
""" """
column_type_formatters = MONGOENGINE_FORMATTERS column_type_formatters = DEFAULT_FORMATTERS
""" """
Customized type formatters for MongoEngine backend Customized type formatters for MongoEngine backend
""" """
......
from flask.ext.admin.model.typefmt import DEFAULT_FORMATTERS, list_formatter
from sqlalchemy.orm.collections import InstrumentedList
DEFAULT_FORMATTERS = DEFAULT_FORMATTERS.copy()
DEFAULT_FORMATTERS.update({
InstrumentedList: list_formatter
})
...@@ -13,6 +13,7 @@ from flask.ext.admin.model import BaseModelView ...@@ -13,6 +13,7 @@ from flask.ext.admin.model import BaseModelView
from flask.ext.admin.actions import action from flask.ext.admin.actions import action
from flask.ext.admin.contrib.sqlamodel import form, filters, tools from flask.ext.admin.contrib.sqlamodel import form, filters, tools
from .typefmt import DEFAULT_FORMATTERS
class ModelView(BaseModelView): class ModelView(BaseModelView):
...@@ -215,6 +216,8 @@ class ModelView(BaseModelView): ...@@ -215,6 +216,8 @@ class ModelView(BaseModelView):
column_labels = {'models': 'Hello'} column_labels = {'models': 'Hello'}
""" """
column_type_formatters = DEFAULT_FORMATTERS
def __init__(self, model, session, def __init__(self, model, session,
name=None, category=None, endpoint=None, url=None): name=None, category=None, endpoint=None, url=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