Merge branch 'flask-admin:master' into ci-fixes

Author: gunlinux

flask_admin/contrib/fileadmin/__init__.py

@@ -388,7 +388,7 @@ def get_edit_form(self):
         """
         class EditForm(self.form_base_class):
             content = fields.TextAreaField(lazy_gettext('Content'),
-                                           (validators.required(),))
+                                           (validators.InputRequired(),))
 
         return EditForm
 
@@ -410,7 +410,7 @@ class NameForm(self.form_base_class):
                 Validates if provided name is valid for *nix and Windows systems.
             """
             name = fields.StringField(lazy_gettext('Name'),
-                                      validators=[validators.Required(),
+                                      validators=[validators.InputRequired(),
                                                   validate_name])
             path = fields.HiddenField()
 
@@ -423,7 +423,7 @@ def get_delete_form(self):
             Override to implement customized behavior.
         """
         class DeleteForm(self.form_base_class):
-            path = fields.HiddenField(validators=[validators.Required()])
+            path = fields.HiddenField(validators=[validators.InputRequired()])
 
         return DeleteForm
 

flask_admin/static/admin/js/form.js

@@ -39,7 +39,7 @@
           },
           initSelection: function(element, callback) {
             $el = $(element);
-            var value = JSON.parse(($el.attr('data-json'));
+            var value = JSON.parse($el.attr('data-json'));
             var result = null;
 
             if (value) {
@@ -461,7 +461,7 @@
                         // prevent minutes from showing in 5 minute increments
                         minuteStep: 1,
                         maxYear: 2030,
-                    }                    
+                    }
                 });
                 return true;
             case 'x-editable-combodate':