Fixed #509. Callable filter options.

flask_admin/model/filters.py

@@ -30,8 +30,13 @@ class BaseFilter(object):
             :param view:
                 Associated administrative view class.
         """
-        if self.options:
-            return [(v, text_type(n)) for v, n in self.options]
+        options = self.options
+
+        if options:
+            if callable(options):
+                options = options()
+
+            return [(v, text_type(n)) for v, n in options]
 
         return None
 

flask_admin/tests/test_model.py

@@ -308,6 +308,19 @@ def test_column_filters():
     # TODO: Make calls with filters
 
 
+def test_filter_list_callable():
+    app, admin = setup()
+
+    flt = SimpleFilter('test', options=lambda: (('1', 'Test 1'), ('2', 'Test 2')))
+
+    view = MockModelView(Model, column_filters=[flt])
+    admin.add_view(view)
+
+    opts = flt.get_options(view)
+    eq_(len(opts), 2)
+    eq_(opts, [('1', u'Test 1'), ('2', u'Test 2')])
+
+
 def test_form():
     # TODO: form_columns
     # TODO: form_excluded_columns