Merge pull request #1379 from jmagnusson/is_hybrid_property-callable-fix

Fix regression with late-evaluation relationships no longer working with filters

flask_admin/contrib/sqla/tools.py

+import types
+
 from sqlalchemy import tuple_, or_, and_, inspect
 from sqlalchemy.ext.declarative.clsregistry import _class_resolver
 from sqlalchemy.ext.hybrid import hybrid_property
@@ -201,6 +203,8 @@ def is_hybrid_property(model, attr_name):
             last_model = attr.property.argument
             if isinstance(last_model, _class_resolver):
                 last_model = model._decl_class_registry[last_model.arg]
+            elif isinstance(last_model, types.FunctionType):
+                last_model = last_model()
         last_name = names[-1]
         return last_name in get_hybrid_properties(last_model)
     else:

flask_admin/tests/sqla/test_basic.py

@@ -84,7 +84,7 @@ def create_models(db):
 
         # Relation
         model1_id = db.Column(db.Integer, db.ForeignKey(Model1.id))
-        model1 = db.relationship(Model1, backref='model2')
+        model1 = db.relationship(lambda: Model1, backref='model2')
 
     db.create_all()