Commit e76fb0a3 authored by Paul Brown's avatar Paul Brown

use as_unicode for bootstrap3 compatibility

parent 0a31df86
...@@ -14,7 +14,7 @@ from flask.ext.admin.actions import ActionsMixin ...@@ -14,7 +14,7 @@ from flask.ext.admin.actions import ActionsMixin
from flask.ext.admin.helpers import get_form_data, validate_form_on_submit, get_redirect_target from flask.ext.admin.helpers import get_form_data, validate_form_on_submit, get_redirect_target
from flask.ext.admin.tools import rec_getattr from flask.ext.admin.tools import rec_getattr
from flask.ext.admin._backwards import ObsoleteAttr from flask.ext.admin._backwards import ObsoleteAttr
from flask.ext.admin._compat import iteritems, OrderedDict from flask.ext.admin._compat import iteritems, OrderedDict, as_unicode
from .helpers import prettify_name, get_mdict_item_or_list from .helpers import prettify_name, get_mdict_item_or_list
from .ajax import AjaxModelLoader from .ajax import AjaxModelLoader
...@@ -594,7 +594,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -594,7 +594,7 @@ class BaseModelView(BaseView, ActionsMixin):
self._filter_groups[flt.name].append({ self._filter_groups[flt.name].append({
'index': i, 'index': i,
'arg': self.get_filter_arg(i, flt), 'arg': self.get_filter_arg(i, flt),
'operation': unicode(flt.operation()), 'operation': as_unicode(flt.operation()),
'options': flt.get_options(self) or None, 'options': flt.get_options(self) or None,
'type': flt.data_type 'type': flt.data_type
}) })
...@@ -809,7 +809,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -809,7 +809,7 @@ class BaseModelView(BaseView, ActionsMixin):
Filter instance Filter instance
""" """
if self.named_filter_urls: if self.named_filter_urls:
name = ('%s %s' % (flt.name, unicode(flt.operation()))).lower() name = ('%s %s' % (flt.name, as_unicode(flt.operation()))).lower()
name = filter_char_re.sub('', name) name = filter_char_re.sub('', name)
name = filter_compact_re.sub('_', name) name = filter_compact_re.sub('_', name)
return name return name
...@@ -945,7 +945,7 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -945,7 +945,7 @@ class BaseModelView(BaseView, ActionsMixin):
# Exception handler # Exception handler
def handle_view_exception(self, exc): def handle_view_exception(self, exc):
if isinstance(exc, ValidationError): if isinstance(exc, ValidationError):
flash(unicode(exc)) flash(as_unicode(exc))
return True return True
if self._debug: if self._debug:
......
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