Merge pull request #1125 from pawl/fix_issue_1117

make flask-admin compatible with peewee 2.7.4

flask_admin/contrib/peewee/tools.py

-from peewee import PrimaryKeyField
-
-
 def get_primary_key(model):
-    for n, f in model._meta.get_sorted_fields():
-        if type(f) == PrimaryKeyField or f.primary_key:
-            return n
+    return model._meta.primary_key.name
 
 
 def parse_like_term(term):

flask_admin/contrib/peewee/view.py

@@ -2,7 +2,7 @@ import logging
 
 from flask import flash
 
-from flask_admin._compat import string_types
+from flask_admin._compat import string_types, iteritems
 from flask_admin.babel import gettext, ngettext, lazy_gettext
 from flask_admin.model import BaseModelView
 from flask_admin.model.form import wrap_fields_in_fieldlist
@@ -149,7 +149,7 @@ class ModelView(BaseModelView):
         if model is None:
             model = self.model
 
-        return model._meta.get_sorted_fields()
+        return iteritems(model._meta.fields)
 
     def scaffold_pk(self):
         return get_primary_key(self.model)