Skip to content

F
flask-admin
Commit 1d5ad50e authored by Serge Koval's avatar Serge Koval
Browse files
Options

Fixed SQLAlchemy 1.3.6 compatibility issue

parent fe0c818c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
flask_admin/contrib/sqla/tools.py
View file @ 1d5ad50e
...@@ -203,7 +203,7 @@ def is_hybrid_property(model, attr_name): ...@@ -203,7 +203,7 @@ def is_hybrid_property(model, attr_name):
last_model = attr.property.argument last_model = attr.property.argument
if isinstance(last_model, _class_resolver): if isinstance(last_model, _class_resolver):
last_model = model._decl_class_registry[last_model.arg] last_model = model._decl_class_registry[last_model.arg]
elif isinstance(last_model, types.FunctionType): elif isinstance(last_model, (types.FunctionType, types.MethodType)):
last_model = last_model() last_model = last_model()
last_name = names[-1] last_name = names[-1]
return last_name in get_hybrid_properties(last_model) return last_name in get_hybrid_properties(last_model)
......
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