Merge branch 'master' of github.com:/mrjoes/flask-admin

examples/auth/auth.py

@@ -197,8 +197,8 @@ def build_sample_db():
 if __name__ == '__main__':
 
     # Build a sample db on the fly, if one does not exist yet.
-    app_dir = op.realpath(os.path.dirname(__file__))
-    database_path = op.join(app_dir, app.config['DATABASE_FILE'])
+    app_dir = os.path.realpath(os.path.dirname(__file__))
+    database_path = os.path.join(app_dir, app.config['DATABASE_FILE'])
     if not os.path.exists(database_path):
         build_sample_db()
 

flask_admin/contrib/peewee/form.py

@@ -90,6 +90,8 @@ class CustomModelConverter(ModelConverter):
         self.converters[DateField] = self.handle_date
         self.converters[TimeField] = self.handle_time
 
+        self.overrides = getattr(self.view, 'form_overrides', None) or {}
+
     def handle_foreign_key(self, model, field, **kwargs):
         loader = getattr(self.view, '_form_ajax_refs', {}).get(field.name)