#139 fixes. Additional unit tests

flask_admin/contrib/sqlamodel/view.py

@@ -394,19 +394,21 @@ class ModelView(BaseModelView):
         """
             Return list of enabled filters
         """
+
         join_tables = []
         if isinstance(name, basestring):
             model = self.model
+
             for attribute in name.split('.'):
                 value = getattr(model, attribute)
-                if (
-                    hasattr(value, 'property')
-                    and hasattr(value.property, 'direction')
-                ):
+                if (hasattr(value, 'property') and
+                    hasattr(value.property, 'direction')):
                     model = value.property.mapper.class_
                     table = model.__table__
+
                     if self._need_join(table):
                         join_tables.append(table)
+
                 attr = value
         else:
             attr = name
@@ -436,10 +438,11 @@ class ModelView(BaseModelView):
 
                     if flt:
                         table = column.table
+
                         if join_tables:
-                            self._filter_joins[table.name.name] = join_tables
+                            self._filter_joins[table.name] = join_tables
                         elif self._need_join(table.name):
-                            self._filter_joins[table.name.name] = [table.name]
+                            self._filter_joins[table.name] = [table.name]
                         filters.extend(flt)
 
             return filters
@@ -451,10 +454,14 @@ class ModelView(BaseModelView):
 
             column = columns[0]
 
-            if not isinstance(name, basestring):
-                visible_name = self.get_column_name(name.property.key)
+            if self._need_join(column.table):
+                visible_name = '%s / %s' % (self.get_column_name(column.table.name),
+                                            self.get_column_name(column.name))
             else:
-                visible_name = self.get_column_name(name)
+                if not isinstance(name, basestring):
+                    visible_name = self.get_column_name(name.property.key)
+                else:
+                    visible_name = self.get_column_name(name)
 
             type_name = type(column.type).__name__
             flt = self.filter_converter.convert(type_name,
@@ -467,6 +474,7 @@ class ModelView(BaseModelView):
                     self._filter_joins[column.table.name] = join_tables
                 elif self._need_join(column.table):
                     self._filter_joins[column.table.name] = [column.table]
+
             return flt
 
     def is_valid_filter(self, filter):
@@ -594,12 +602,15 @@ class ModelView(BaseModelView):
             for idx, value in filters:
                 flt = self._filters[idx]
 
-                # Figure out join
+                # Figure out joins
                 tbl = flt.column.table.name
+
                 join_tables = self._filter_joins.get(tbl, [])
+
                 for table in join_tables:
-                    query = query.join(table)
-                    joins.add(table)
+                    if table.name not in joins:
+                        query = query.join(table)
+                        joins.add(table)
 
                 # Apply filter
                 query = flt.apply(query, value)
@@ -616,6 +627,7 @@ class ModelView(BaseModelView):
             if sort_column in self._sortable_columns:
                 sort_field = self._sortable_columns[sort_column]
 
+                # TODO: Preprocessing for joins
                 # Try to handle it as a string
                 if isinstance(sort_field, basestring):
                     # Create automatic join against a table if column name

flask_admin/model/filters.py

@@ -29,7 +29,10 @@ class BaseFilter(object):
             :param view:
                 Associated administrative view class.
         """
-        return self.options
+        if self.options:
+            return [(v, unicode(n)) for v, n in self.options]
+
+        return None
 
     def validate(self, value):
         """

flask_admin/tests/peeweemodel/test_basic.py

@@ -94,8 +94,8 @@ def test_model():
     model = Model1.select().get()
     eq_(model.test1, 'test1large')
     eq_(model.test2, 'test2')
-    eq_(model.test3, None)
-    eq_(model.test4, None)
+    ok_(model.test3 is None or model.test3 == '')
+    ok_(model.test4 is None or model.test4 == '')
 
     rv = client.get('/admin/model1view/')
     eq_(rv.status_code, 200)
@@ -112,8 +112,8 @@ def test_model():
     model = Model1.select().get()
     eq_(model.test1, 'test1small')
     eq_(model.test2, 'test2large')
-    eq_(model.test3, None)
-    eq_(model.test4, None)
+    ok_(model.test3 is None or model.test3 == '')
+    ok_(model.test4 is None or model.test4 == '')
 
     url = '/admin/model1view/delete/?id=%s' % model.id
     rv = client.post(url)

flask_admin/tests/sqlamodel/test_basic.py

@@ -223,9 +223,53 @@ def test_column_filters():
             (2, 'contains'),
             (3, 'not contains')
         ],
+    })
+
+    # Test filter that references property
+    view = CustomModelView(Model2, db.session,
+                           column_filters=['model1'])
 
+    eq_(view._filter_dict, {
+        'Model1 / Test1': [
+            (0, 'equals'),
+            (1, 'not equal'),
+            (2, 'contains'),
+            (3, 'not contains')
+        ],
+        'Model1 / Test2': [
+            (4, 'equals'),
+            (5, 'not equal'),
+            (6, 'contains'),
+            (7, 'not contains')
+        ],
+        'Model1 / Test3': [
+            (8, 'equals'),
+            (9, 'not equal'),
+            (10, 'contains'),
+            (11, 'not contains')
+        ],
+        'Model1 / Test4': [
+            (12, 'equals'),
+            (13, 'not equal'),
+            (14, 'contains'),
+            (15, 'not contains')
+        ],
+        'Model1 / Bool Field': [
+            (16, 'equals'),
+            (17, 'not equal'),
+        ],
     })
 
+    # Test filter with a dot
+    view = CustomModelView(Model2, db.session,
+                           column_filters=['model1.bool_field'])
+
+    eq_(view._filter_dict, {
+        'Model1 / Bool Field': [
+            (0, 'equals'),
+            (1, 'not equal'),
+        ],
+    })
     # Fill DB
     model1_obj1 = Model1('model1_obj1', bool_field=True)
     model1_obj2 = Model1('model1_obj2')
@@ -429,6 +473,7 @@ def test_on_model_change_delete():
     client.post(url)
     ok_(view.deleted)
 
+
 def test_multiple_delete():
     app, db, admin = setup()
     M1, _ = create_models(db)