Commit 4e551902 authored by Serge S. Koval's avatar Serge S. Koval

Fixed #245. Filter options can now be localized

parent 698f4615
...@@ -871,6 +871,12 @@ class BaseModelView(BaseView, ActionsMixin): ...@@ -871,6 +871,12 @@ class BaseModelView(BaseView, ActionsMixin):
""" """
return rec_getattr(model, name) return rec_getattr(model, name)
def _get_filter_dict(self):
"""
Return flattened filter dictionary which can be JSON-serialized.
"""
return dict((unicode(k), v) for k, v in self._filter_dict.iteritems())
@contextfunction @contextfunction
def get_list_value(self, context, model, name): def get_list_value(self, context, model, name):
""" """
......
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
{% if filter_groups is not none and filter_data is not none %} {% if filter_groups is not none and filter_data is not none %}
var filter = new AdminFilters( var filter = new AdminFilters(
'#filter_form', '.field-filters', '#filter_form', '.field-filters',
{{ admin_view._filter_dict|tojson|safe }}, {{ admin_view._get_filter_dict()|tojson|safe }},
{{ filter_data|tojson|safe }}, {{ filter_data|tojson|safe }},
{{ filter_types|tojson|safe }} {{ filter_types|tojson|safe }}
); );
......
...@@ -565,3 +565,6 @@ def test_default_sort(): ...@@ -565,3 +565,6 @@ def test_default_sort():
eq_(data[0].test1, 'a') eq_(data[0].test1, 'a')
eq_(data[1].test1, 'b') eq_(data[1].test1, 'b')
eq_(data[2].test1, 'c') eq_(data[2].test1, 'c')
# TODO: Babel tests
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