Fixed #470. SQLAlchemy 0.7 support

7b7064fe · Serge S. Koval · 1745c404 · 7b7064fe
Commit 7b7064fe authored Mar 05, 2014 by Serge S. Koval
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

tools.py flask_admin/contrib/sqla/tools.py +5 -2

No files found.
--- a/flask_admin/contrib/sqla/tools.py
+++ b/flask_admin/contrib/sqla/tools.py
@@ -32,8 +32,11 @@ def get_primary_key(model):
                    pks.append(get_column_for_current_model(p).key)
                else:
                    pks.append(p.key)
-        elif p.is_primary():
+        else:
-            pks.append(p.key)
+            for c in p.columns:
+                if c.primary_key:
+                    pks.append(p.key)
+                    break
    if len(pks) == 1:
        return pks[0]