Merge pull request #1890 from Royal-Society-of-New-Zealand/issue-1889

fix

flask_admin/contrib/peewee/view.py

@@ -186,7 +186,7 @@ def scaffold_pk(self):
     def get_pk_value(self, model):
         if self.model._meta.composite_key:
             return tuple([
-                model._data[field_name]
+                getattr(model, field_name)
                 for field_name in self.model._meta.primary_key.field_names])
         return getattr(model, self._primary_key)
 
@@ -218,8 +218,7 @@ def init_search(self):
 
                 # Check type
                 if not isinstance(p, (CharField, TextField)):
-                    raise Exception('Can only search on text columns. ' +
-                                    'Failed to setup search for "%s"' % p)
+                    raise Exception(f'Can only search on text columns. Failed to setup search for "{p}"')
 
                 self._search_fields.append(p)