Merge flask -admin 1.5.8 changes from upstream.

.travis.yml

@@ -1,4 +1,3 @@
-sudo: false
 language: python
 matrix:
   include:

README.rst

@@ -88,12 +88,12 @@ Or alternatively, you can download the repository and install manually by doing:
 
 Tests
 -----
-Test are run with *nose*. If you are not familiar with this package you can get some more info from `their website <https://nose.readthedocs.io/>`_.
+Test are run with *pytest*. If you are not familiar with this package you can get some more info from `their website <https://pytest.org/>`_.
 
 To run the tests, from the project directory, simply::
 
     pip install -r requirements-dev.txt
-    nosetests
+    pytest
 
 You should see output similar to::
 

doc/advanced.rst

@@ -432,8 +432,8 @@ This is minimal PyMongo view::
 
 On top of that you can add sortable columns, filters, text search, etc.
 
-For more, check the :class:`~flask_admin.contrib.pymongoe` API documentation. Or look at
-the Peewee example at https://github.com/flask-admin/flask-admin/tree/master/examples/pymongo.
+For more, check the :class:`~flask_admin.contrib.pymongo` API documentation. Or look at
+the pymongo example at https://github.com/flask-admin/flask-admin/tree/master/examples/pymongo.
 
 Migrating From Django
 ---------------------

doc/changelog.rst

@@ -1,6 +1,19 @@
 Changelog
 =========
 
+1.5.8
+-----
+
+* SQLAlchemy 1.4.5+ compatibility fixes
+* Redis CLI fixes
+
+1.5.7
+-----
+
+* Bootstrap 4 support!
+* Added hook for custom SQLAlchemy models initializers
+* SQLAlchemy 1.4/2.0 compatibility fix
+
 1.5.6
 -----
 

doc/introduction.rst

@@ -206,7 +206,7 @@ details view** by setting::
     can_view_details = True
 
 **Removing columns** from the list view is easy, just pass a list of column names for
-the *column_excludes_list* parameter::
+the *column_exclude_list* parameter::
 
     column_exclude_list = ['password', ]
 

examples/auth-flask-login/app.py

@@ -164,7 +164,7 @@ def index():
 init_login()
 
 # Create admin
-admin = admin.Admin(app, 'Example: Auth', index_view=MyAdminIndexView(), base_template='my_master.html')
+admin = admin.Admin(app, 'Example: Auth', index_view=MyAdminIndexView(), base_template='my_master.html', template_mode='bootstrap4')
 
 # Add view
 admin.add_view(MyModelView(User, db.session))

examples/auth-flask-login/templates/admin/index.html

@@ -16,8 +16,8 @@ <h1>Flask-Admin example</h1>
         <form method="POST" action="">
             {{ form.hidden_tag() if form.hidden_tag }}
             {% for f in form if f.type != 'CSRFTokenField' %}
-            <div>
-            {{ f.label }}
+            <div class="form-group">
+            {{ f.label }}<br>
             {{ f }}
             {% if f.errors %}
             <ul>
@@ -28,7 +28,7 @@ <h1>Flask-Admin example</h1>
             {% endif %}
             </div>
             {% endfor %}
-            <button class="btn" type="submit">Submit</button>
+            <button class="btn btn-primary" type="submit">Submit</button>
         </form>
         {{ link | safe }}
         {% endif %}

examples/auth-flask-login/templates/my_master.html

@@ -2,13 +2,14 @@
 
 {% block access_control %}
 {% if current_user.is_authenticated %}
-<div class="btn-group pull-right">
-    <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+<div class="dropdown show">
+  <a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <i class="icon-user"></i> {{ current_user.login }} <span class="caret"></span>
-    </a>
-    <ul class="dropdown-menu">
-        <li><a href="{{ url_for('admin.logout_view') }}">Log out</a></li>
-    </ul>
+  </a>
+
+  <div class="dropdown-menu" aria-labelledby="dropdownMenuLink">
+    <a class="btn" href="{{ url_for('admin.logout_view') }}">Log out</a>
+  </div>
 </div>
 {% endif %}
 {% endblock %}

examples/auth/requirements.txt

@@ -2,3 +2,4 @@ Flask
 Flask-Admin
 Flask-SQLAlchemy
 Flask-Security>=1.7.5
+email_validator

examples/bootstrap4/app.py

@@ -1,3 +1,4 @@
+import datetime
 import os
 import os.path as op
 from flask import Flask
@@ -27,6 +28,7 @@ class User(db.Model):
     name = db.Column(db.Unicode(64))
     email = db.Column(db.Unicode(64))
     active = db.Column(db.Boolean, default=True)
+    created_at = db.Column(db.DateTime, default=datetime.datetime.now)
 
     def __unicode__(self):
         return self.name

examples/peewee/app.py

@@ -1,11 +1,11 @@
-from flask import Flask
+import uuid
 
 import peewee
+from flask import Flask
 
 import flask_admin as admin
 from flask_admin.contrib.peewee import ModelView
 
-
 app = Flask(__name__)
 app.config['SECRET_KEY'] = '123456790'
 
@@ -36,6 +36,7 @@ def __unicode__(self):
 
 
 class Post(BaseModel):
+    id = peewee.UUIDField(primary_key=True, default=uuid.uuid4)
     title = peewee.CharField(max_length=120)
     text = peewee.TextField(null=False)
     date = peewee.DateTimeField()
@@ -80,6 +81,7 @@ def index():
 
 if __name__ == '__main__':
     import logging
+
     logging.basicConfig()
     logging.getLogger().setLevel(logging.DEBUG)
 

examples/sqla-custom-inline-forms/app.py

@@ -19,7 +19,7 @@
 # Create application
 app = Flask(__name__)
 
-# Create dummy secrey key so we can use sessions
+# Create dummy secret key so we can use sessions
 app.config['SECRET_KEY'] = '123456790'
 
 # Create in-memory database

examples/sqla/requirements.txt

@@ -7,6 +7,7 @@ enum34; python_version < '3.0'
 sqlalchemy_utils
 arrow
 colour
+email_validator
 
 # note: for local development, replace 'Flask-Admin' above with a reference to
 # your local copy of the repo e.g. '-e .' if you're installing this from the

flask_admin/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.5.6'
+__version__ = '1.5.8'
 __author__ = 'Flask-Admin team'
 __email__ = 'serge.koval+github@gmail.com'
 

flask_admin/_compat.py

@@ -90,3 +90,8 @@ def __new__(cls, name, this_bases, d):
     from collections import OrderedDict
 except ImportError:
     from ordereddict import OrderedDict
+
+try:
+    from jinja2 import pass_context
+except ImportError:
+    from jinja2 import contextfunction as pass_context

flask_admin/base.py

@@ -582,6 +582,29 @@ def add_views(self, *args):
         for view in args:
             self.add_view(view)
 
+    def add_category(self, name, class_name=None, icon_type=None, icon_value=None):
+        """
+            Add a category of a given name
+
+            :param name:
+                The name of the new menu category.
+            :param class_name:
+                The class name for the new menu category.
+            :param icon_type:
+                The icon name for the new menu category.
+            :param icon_value:
+                The icon value for the new menu category.
+        """
+        cat_text = as_unicode(name)
+
+        category = self.get_category_menu_item(name)
+        if category:
+            return
+
+        category = MenuCategory(name, class_name=class_name, icon_type=icon_type, icon_value=icon_value)
+        self._menu_categories[cat_text] = category
+        self._menu.append(category)
+
     def add_sub_category(self, name, parent_name):
 
         """

flask_admin/contrib/fileadmin/s3.py

@@ -134,7 +134,10 @@ def send_file(self, file_path):
 
     def save_file(self, path, file_data):
         key = Key(self.bucket, path)
-        key.set_contents_from_file(file_data.stream)
+        headers = {
+            'Content-Type': file_data.content_type,
+        }
+        key.set_contents_from_file(file_data.stream, headers=headers)
 
     def delete_tree(self, directory):
         self._check_empty_directory(directory)

flask_admin/contrib/geoa/typefmt.py

@@ -1,5 +1,5 @@
 from flask_admin.contrib.sqla.typefmt import DEFAULT_FORMATTERS as BASE_FORMATTERS
-from jinja2 import Markup
+from markupsafe import Markup
 from wtforms.widgets import html_params
 from geoalchemy2.shape import to_shape
 from geoalchemy2.elements import WKBElement

flask_admin/contrib/mongoengine/typefmt.py

@@ -1,4 +1,4 @@
-from jinja2 import Markup, escape
+from markupsafe import Markup, escape
 
 from mongoengine.base import BaseList
 from mongoengine.fields import GridFSProxy, ImageGridFsProxy

flask_admin/contrib/mongoengine/widgets.py

@@ -1,6 +1,6 @@
 from wtforms.widgets import html_params
 
-from jinja2 import escape
+from markupsafe import escape
 
 from mongoengine.fields import GridFSProxy, ImageGridFsProxy
 

flask_admin/contrib/peewee/view.py

@@ -453,7 +453,7 @@ def create_model(self, form):
             model = self.model()
             form.populate_obj(model)
             self._on_model_change(form, model, True)
-            model.save()
+            model.save(force_insert=True)
 
             # For peewee have to save inline forms after model was saved
             save_inline(form, model)

flask_admin/contrib/rediscli.py

@@ -4,7 +4,7 @@
 
 from flask import request
 
-from jinja2 import Markup
+from markupsafe import Markup
 
 from flask_admin.base import BaseView, expose
 from flask_admin.babel import gettext
@@ -196,7 +196,7 @@ def execute_view(self):
             AJAX API.
         """
         try:
-            cmd = request.form.get('cmd').lower()
+            cmd = request.form.get('cmd')
             if not cmd:
                 return self._error('Cli: Empty command.')
 

flask_admin/contrib/sqla/form.py

@@ -345,7 +345,11 @@ def convert_arrow_time(self, field_args, **extra):
         return form.DateTimeField(**field_args)
 
     @converts('sqlalchemy_utils.types.email.EmailType')
-    def convert_email(self, field_args, **extra):
+    def convert_email(self, field_args, column=None, **extra):
+        if column.nullable:
+            filters = field_args.get('filters', [])
+            filters.append(lambda x: x or None)
+            field_args['filters'] = filters
         field_args['validators'].append(validators.Email())
         return fields.StringField(**field_args)
 

flask_admin/contrib/sqla/tools.py

@@ -1,7 +1,12 @@
 import types
 
 from sqlalchemy import tuple_, or_, and_, inspect
-from sqlalchemy.ext.declarative.clsregistry import _class_resolver
+try:
+    # Attempt _class_resolver import from SQLALchemy 1.4/2.0 module architecture.
+    from sqlalchemy.orm.clsregistry import _class_resolver
+except ImportError:
+    # If 1.4/2.0 module import fails, fall back to <1.3.x architecture.
+    from sqlalchemy.ext.declarative.clsregistry import _class_resolver
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.ext.associationproxy import ASSOCIATION_PROXY
 from sqlalchemy.sql.operators import eq
@@ -201,7 +206,9 @@ def is_hybrid_property(model, attr_name):
             if is_association_proxy(attr):
                 attr = attr.remote_attr
             last_model = attr.property.argument
-            if isinstance(last_model, _class_resolver):
+            if isinstance(last_model, string_types):
+                last_model = attr.property._clsregistry_resolve_name(last_model)()
+            elif isinstance(last_model, _class_resolver):
                 last_model = model._decl_class_registry[last_model.arg]
             elif isinstance(last_model, (types.FunctionType, types.MethodType)):
                 last_model = last_model()

flask_admin/form/fields.py

@@ -191,7 +191,7 @@ def _value(self):
             # prevent utf8 characters from being converted to ascii
             return as_unicode(json.dumps(self.data, ensure_ascii=False))
         else:
-            return ''
+            return '{}'
 
     def process_formdata(self, valuelist):
         if valuelist:

flask_admin/form/rules.py

@@ -1,4 +1,4 @@
-from jinja2 import Markup
+from markupsafe import Markup
 
 from flask_admin._compat import string_types
 from flask_admin import helpers

flask_admin/form/upload.py

@@ -4,7 +4,7 @@
 from werkzeug.utils import secure_filename
 from werkzeug.datastructures import FileStorage
 
-from wtforms import ValidationError, fields
+from wtforms import ValidationError, fields, __version__ as wtforms_version
 from wtforms.widgets import html_params
 
 try:
@@ -186,6 +186,9 @@ class MyForm(BaseForm):
 
         self._should_delete = False
 
+        if int(wtforms_version[0]) < 3:
+            kwargs.pop('extra_filters', None)
+
         super(FileUploadField, self).__init__(label, validators, **kwargs)
 
     def is_file_allowed(self, filename):
@@ -216,13 +219,16 @@ def pre_validate(self, form):
         if not self._allow_overwrite and os.path.exists(self._get_path(self.data.filename)):
             raise ValidationError(gettext('File "%s" already exists.' % self.data.filename))
 
-    def process(self, formdata, data=unset_value):
+    def process(self, formdata, data=unset_value, extra_filters=None):
         if formdata:
             marker = '_%s-delete' % self.name
             if marker in formdata:
                 self._should_delete = True
 
-        return super(FileUploadField, self).process(formdata, data)
+        if int(wtforms_version[0]) < 3:
+            return super(FileUploadField, self).process(formdata, data)
+        else:
+            return super(FileUploadField, self).process(formdata, data, extra_filters)  # noqa
 
     def process_formdata(self, valuelist):
         if self._should_delete:

flask_admin/helpers.py

@@ -1,9 +1,8 @@
 from re import sub, compile
-from jinja2 import contextfunction
 from flask import g, request, url_for, flash
 from wtforms.validators import DataRequired, InputRequired
 
-from flask_admin._compat import urljoin, urlparse, iteritems
+from flask_admin._compat import iteritems, pass_context, urljoin, urlparse
 
 from ._compat import string_types
 
@@ -109,7 +108,7 @@ def flash_errors(form, message):
         flash(gettext(message, error=str(errors)), 'error')
 
 
-@contextfunction
+@pass_context
 def resolve_ctx(context):
     """
         Resolve current Jinja2 context and store it for general consumption.